Attachment 293771 Details for Bug 381241 – use datadir for noarch files and other fixes

[patch] use datadir for noarch files and other fixes

ncl.spec.diff (text/plain), 7.11 KB, created by Patrice Dumas on 2008-02-02 00:54:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-02-02 00:54:08 UTC

Size: 7.11 KB

patch

obsolete

>--- ncl.spec	2007-12-15 00:16:47.000000000 +0100
>+++ ncl.spec-pat	2008-02-02 00:32:28.000000000 +0100
>@@ -1,6 +1,6 @@
> Name:           ncl
> Version:        5.0.0
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        NCAR Command Language and NCAR Graphics
> 
> Group:          Applications/Engineering
>@@ -8,9 +8,25 @@
> URL:            http://www.ncl.ucar.edu
> Source0:        http://datanode.ucar.edu/data/xserve/ncl/5.0.0/binaries/source/ncl_ncarg_src-5.0.0.tar.gz
> Source1:        Site.local
>-Source2:        ncarg.csh
>-Source3:        ncarg.sh
>-Patch0:         ncarg-4.4.1-rpmroot.patch
>+#Source2:        ncarg.csh
>+#Source3:        ncarg.sh
>+#Patch0:         ncarg-4.4.1-rpmroot.patch
>+
>+# ymake uses cpp with some defines on the command line to generate a 
>+# Makefile which consists in:
>+#  Template: command line defines
>+#  Site.conf
>+#  LINUX
>+#  Site.conf
>+#  Template: generic defaults, including default paths
>+#  Project
>+#  Rules
>+#  yMakefile
>+#  Template: some rules
>+#
>+# install paths are set up in Project. Paths used in code are also in 
>+# Project, in NGENV_DESCRIPT.
>+Patch0:         ncl-5.0.0-paths.patch
> Patch1:         ncarg-4.4.1-deps.patch
> Patch2:         ncarg-4.4.2-ppc64.patch
> Patch4:         ncl-5.0.0-triangle.patch
>@@ -19,6 +35,13 @@
> Patch7:         ncl-5.0.0-atlas.patch
> Patch8:         ncl-5.0.0-png.patch
> Patch9:         ncl-5.0.0-wrapit.patch
>+# don't have the installation target depends on the build target since
>+# for library it implies running ranlib and modifying the library timestamp
>+Patch10:        ncl-5.0.0-no_install_dep.patch
>+# put install and build rules before script rules such that the default rule
>+# is all
>+Patch11:        ncl-5.0.0-build_n_scripts.patch
>+Patch12:        ncl-5.0.0-netcdff.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel, libjpeg-devel
>@@ -62,7 +85,8 @@
> 
> %prep
> %setup -q -n ncl_ncarg-%{version}
>-%patch0 -p1 -b .rpmroot
>+#%patch0 -p1 -b .rpmroot
>+%patch0 -p1 -b .paths
> %patch1 -p1 -b .deps
> %patch2 -p1 -b .ppc64
> %patch4 -p1 -b .triangle
>@@ -71,6 +95,9 @@
> %patch7 -p1 -b .atlas
> %patch8 -p1 -b .png
> %patch9 -p1 -b .wrapit
>+%patch10 -p1 -b .no_install_dep
>+%patch11 -p1 -b .build_n_scripts
>+%patch12 -p1 -b .netcdff
> 
> #Move wrapit.c to wrapit77.c to avoid flex make rule issues
> #This works in combination with the wrapit patch
>@@ -82,34 +109,56 @@
> %endif
> 
> #Fixup LINUX config
>-sed -i -e '/StdDefines/s/-DSYSV//' -e '/FCompiler/s/g77/gfortran/' \
>-       -e '/CtoFLibraries/s/-lg2c -lgcc/-lgfortran/' \
>-       -e '/CcOptions/s/$/ $(RPM_OPT_FLAGS)/' \
>-       -e '/FcOptions/s/$/ $(RPM_OPT_FLAGS)/' config/LINUX
>+sed -i -e '/StdDefines/s/-DSYSV//' config/LINUX
>+#sed -i -e '/StdDefines/s/-DSYSV//' -e '/FCompiler/s/g77/gfortran/' \
>+#       -e '/CtoFLibraries/s/-lg2c -lgcc/-lgfortran/' \
>+#       -e '/CcOptions/s/$/ $(RPM_OPT_FLAGS)/' \
>+#       -e '/FcOptions/s/$/ $(RPM_OPT_FLAGS)/' config/LINUX
> 
> #Fixup libdir for atlas lib locations
> sed -i -e s,%LIBDIR%,%{_libdir}, config/Project
> 
> rm -rf external/blas external/lapack
> 
>-cp %{SOURCE1} config
>+# fix the install directories
>+sed -e 's;@prefix@;%{_prefix};' \
>+ -e 's;@mandir@;%{_mandir};' \
>+ -e 's;@datadir@;%{_datadir};' \
>+ -e 's;@libdir@;%{_libdir};' \
>+ %{SOURCE1} > config/Site.local
> #Fix up the lib install dir
>-cp %{SOURCE2} %{SOURCE3} .
>-sed -i -e s,@LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
>+#cp %{SOURCE2} %{SOURCE3} .
>+#sed -i -e s,@LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
> 
>+pushd ni/src/examples
>+for file in */*.ncl; do
>+  sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex$[^ ;]*$;loadscript(ncargpath("nclex") + "\1);' \
>+    -e 's;"\$NCARG_ROOT/lib/ncarg/$data\|database$;ncargpath("\1") + ";' \
>+   $file
>+done
>+popd
> 
> %build
>-export NCARG=`pwd`
>-echo n | ./Configure
>-make Build
>+#export NCARG=`pwd`
>+#echo n | ./Configure
>+# short-cicuit:
>+./config/ymkmf
>+
>+# ./config/ymkmf could be also short circuited, since it does:
>+# (cd ./config; make -f Makefile.ini clean all)
>+# ./config/ymake -config ./config -Curdir . -Topdir .
>+
>+make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC" F77=gfortran F77_LD=gfortran\
>+ CTOFLIBS="-lgfortran" FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore" \
>+ COPT= FOPT=
> 
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> export NCARG=`pwd`
> make install DESTDIR=$RPM_BUILD_ROOT
>-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
>-install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
>+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
>+#install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
> # Don't conflict with allegro-devel (generic API names)
> for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/*
> do
>@@ -117,7 +166,7 @@
>    mv $manpage $RPM_BUILD_ROOT%{_mandir}/man3/%{name}_$manname
> done
> # Remove $RPM_BUILD_ROOT from MakeNcl
>-sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl
>+#sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl
> 
> 
> %clean
>@@ -127,7 +176,7 @@
> %files
> %defattr(-,root,root,-)
> %doc COPYING Copyright README
>-%{_sysconfdir}/profile.d/ncarg.*sh
>+#%{_sysconfdir}/profile.d/ncarg.*sh
> %{_bindir}/ConvertMapData
> %{_bindir}/WriteLineFile
> %{_bindir}/WriteNameFile
>@@ -174,20 +223,18 @@
> %{_bindir}/tdpackdemo
> %{_bindir}/tgks0a
> %{_bindir}/tlocal
>-%dir %{_libdir}/ncarg
>-%dir %{_libdir}/ncarg/ncarg
>-%{_libdir}/ncarg/ncarg/colormaps/
>-%{_libdir}/ncarg/ncarg/data/
>-%{_libdir}/ncarg/ncarg/database/
>-%{_libdir}/ncarg/ncarg/fontcaps/
>-%{_libdir}/ncarg/ncarg/graphcaps/
>-%exclude %{_libdir}/ncarg/ncarg/graphcaps/aed.a
>-%{_libdir}/ncarg/ncarg/grib2_codetables/
>-%{_libdir}/ncarg/ncarg/nclscripts/
>-%{_libdir}/ncarg/ncarg/ngwww/
>-%{_libdir}/ncarg/ncarg/sysresfile
>-%{_libdir}/ncarg/ncarg/udunits/
>-%{_libdir}/ncarg/ncarg/xapp/
>+%dir %{_datadir}/ncarg
>+%{_datadir}/ncarg/colormaps/
>+%{_datadir}/ncarg/data/
>+%{_datadir}/ncarg/database/
>+%{_datadir}/ncarg/fontcaps/
>+%{_datadir}/ncarg/graphcaps/
>+%{_datadir}/ncarg/grib2_codetables/
>+%{_datadir}/ncarg/nclscripts/
>+%{_datadir}/ncarg/ngwww/
>+%{_datadir}/ncarg/sysresfile
>+%{_datadir}/ncarg/udunits/
>+%{_datadir}/ncarg/xapp/
> %{_mandir}/man1/*.gz
> %{_mandir}/man5/*.gz
> %{_bindir}/scrip_check_input
>@@ -206,6 +253,7 @@
> %{_bindir}/nhlf90
> %{_bindir}/wrapit77
> %{_includedir}/ncarg/
>+%dir %{_libdir}/ncarg
> %{_libdir}/ncarg/libcgm.a
> %{_libdir}/ncarg/libfftpack5_dp.a
> %{_libdir}/ncarg/libhlu.a
>@@ -220,18 +268,21 @@
> %{_libdir}/ncarg/libnfp.a
> %{_libdir}/ncarg/libnfpfort.a
> %{_libdir}/ncarg/libsphere3.1_dp.a
>-%{_libdir}/ncarg/ncarg/examples/
>-%{_libdir}/ncarg/ncarg/graphcaps/aed.a
>-%{_libdir}/ncarg/ncarg/hluex/
>-%{_libdir}/ncarg/ncarg/nclex/
>-%{_libdir}/ncarg/ncarg/resfiles/
> %{_libdir}/ncarg/ncarg/robj/
>-%{_libdir}/ncarg/ncarg/tests/
>-%{_libdir}/ncarg/ncarg/tutorial/
>+%{_datadir}/ncarg/examples/
>+%{_datadir}/ncarg/hluex/
>+%{_datadir}/ncarg/nclex/
>+%{_datadir}/ncarg/resfiles/
>+%{_datadir}/ncarg/tests/
>+%{_datadir}/ncarg/tutorial/
> %{_mandir}/man3/*.gz
> 
> 
> %changelog
>+* Fri Feb  1 2008 - Patrice Dumas <pertusus@free.fr> - 5.0.0-6
>+- put noarch files in datadir
>+- avoid compilation in %%install
>+
> * Fri Dec 14 2007 - Orion Poplawski <orion@cora.nwra.com> - 5.0.0-5
> - Fixup wrapit flex compilation
>

Actions: View | Diff

Attachments on bug 381241: 293771 | 293772 | 293773 | 293774 | 293776 | 293777