Attachment 301965 Details for Bug 441816 – spec file patch, drop upstreamed patches, update

[patch] spec file patch, drop upstreamed patches, update

ncview.diff (text/plain), 3.57 KB, created by Patrice Dumas on 2008-04-10 11:19:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-04-10 11:19:48 UTC

Size: 3.57 KB

patch

obsolete

>? .build-1.92e-13.fc9.log
>? .build-1.93c-1.fc9.log
>? .build-1.93c-13.fc9.log
>? README
>? genoverlay
>? i386
>? ncview-1.92e
>? ncview-1.93c
>? ncview-1.93c-1.fc9.src.rpm
>? ncview-1.93c.tar.gz
>? udunits.tar
>Index: ncview.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/ncview/devel/ncview.spec,v
>retrieving revision 1.10
>diff -u -3 -p -r1.10 ncview.spec
>--- ncview.spec	19 Feb 2008 02:22:45 -0000	1.10
>+++ ncview.spec	10 Apr 2008 11:17:45 -0000
>@@ -1,19 +1,17 @@
> Name:           ncview
>-Version:        1.92e
>-Release:        13%{?dist}
>+Version:        1.93c
>+Release:        1%{?dist}
> Summary:        A visual browser for netCDF format files
> Group:          Applications/Engineering
>-License:        GPL
>+License:        GPLv1
> URL:            http://meteora.ucsd.edu/~pierce/ncview_home_page.html
>-Source0:        ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.92e.tar.gz
>-Patch0:		ncview-1.92e-Makefile.in.patch
>-Patch1:		ncview-1.92e-netpbm.patch
>-Patch2:		ncview-1.92e-do_print.c.patch
>+Source0:        ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.93c.tar.gz
>+Patch0:         ncview-1.92e-Makefile.in.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  xorg-x11-proto-devel libXaw-devel libXt-devel libXext-devel
> BuildRequires:  libXmu-devel libICE-devel libSM-devel libX11-devel
>-BuildRequires:  netcdf-devel netcdf-static udunits-devel netpbm-devel
>+BuildRequires:  netcdf-devel udunits-devel netpbm-devel
> Requires:       xorg-x11-server-Xorg udunits
> 
> %description
>@@ -26,13 +24,11 @@ color maps, invert the data, etc.
> %prep
> %setup -q
> %patch0 -p1
>-%patch1 -p1
>-%patch2 -p1
>+#%patch1 -p1
> 
> %build
> %configure --with-netcdf_incdir=%{_includedir}/netcdf-3 \
>-  --with-netcdf_libdir=%{_libdir} --with-ppm_libdir=%{_libdir} \
>-  --prefix=/usr --datadir=%{_datadir}/ncview
>+ --x-libraries=%{_libdir}  --datadir=%{_datadir}/ncview
> #  WARNING!
> #  The parallel build was tested and it does NOT work.
> #  make %{?_smp_mflags}
>@@ -42,13 +38,14 @@ sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview=
> %install
> rm -rf $RPM_BUILD_ROOT
> mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
>-cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
>-cat > install-appdef <<EOF
>-#!/bin/bash
>-echo "no longer needed"
>-EOF
>+cp -p Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
>+#cat > install-appdef <<EOF
>+##!/bin/bash
>+#echo "no longer needed"
>+#EOF
> %makeinstall NCVIEW_LIB_DIR=${RPM_BUILD_ROOT}%{_datadir}/ncview BINDIR=${RPM_BUILD_ROOT}%{_bindir} MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man1
>-chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
>+mkdir ${RPM_BUILD_ROOT}%{_datadir}/ncview/
>+install -m0644 -p *.ncmap nc_overlay* ${RPM_BUILD_ROOT}%{_datadir}/ncview/
> chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
> chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
> 
>@@ -61,12 +58,15 @@ rm -rf $RPM_BUILD_ROOT
> %defattr(-,root,root,-)
> %doc README COPYING
> %{_bindir}/*
>-%{_datadir}/ncview
>+%{_datadir}/ncview/
> %{_datadir}/X11/app-defaults/Ncview
> %{_mandir}/man1/*
> 
> 
> %changelog
>+* Thu Apr 10 2008 Patrice Dumas <pertusus@free.fr> - 1.93c-1
>+- update to 1.93c
>+
> * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.92e-13
> - Autorebuild for GCC 4.3
> 
>@@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
> - mkstemp() security fix and more cleanups
> 
> * Wed Jul  6 2005 Ed Hill <ed@eh3.com> - 1.92e-3
>-- move the data files to %{_datadir} and add COPYING
>+- move the data files to %%{_datadir} and add COPYING
> - added xorg-x11 Requires and BuildRequires
> 
> * Tue Jul  5 2005 Ed Hill <ed@eh3.com> - 1.92e-2

Actions: View | Diff

Attachments on bug 441816: 301965