rpms/cernlib/F-8 cernlib.spec,1.63,1.64

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213

Modified Files:
	cernlib.spec 
Log Message:
* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20
- don't use the same spec for epel4
- always ship the packages with compiler suffix. This is needed for 
  proper upgrade path as soon as such a package has been ever shipped
- fix timestamps



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/F-8/cernlib.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- cernlib.spec	21 Sep 2007 09:01:05 -0000	1.63
+++ cernlib.spec	2 Nov 2007 00:25:15 -0000	1.64
@@ -3,59 +3,38 @@
 %bcond_without gfortran
 %else
 %bcond_with gfortran
+# this is set to 1 if g77 is used for the cernlib package without
+# suffix.
+%define g77_cernlib_compiler 1
 %endif
+
 %if "%fedora" <= "3" 
 %define old_lapack_name 1
 %endif
 %if "%fedora" <= "4"
 %define monolithic_X 1
 %endif
-%if "%fedora" <= "6"
-%define g77_default_compiler 1
-%endif
 %endif
 
 %if 0%{?rhel}
-%if "%rhel" <= "4"
-# set to 1 if the optflags are compatible with what g77 wants. This should
-# be true for the releases that use gcc < 4. For newer releases the
-# optflags are for gfortran and should be filtered out if g77 is used
-%define optflags_for_g77 1
-%define old_lapack_name 1
-%define monolithic_X 1
-# this is set to 1 if g77 has to be used for the cernlib package without
-# suffix.
-%define g77_default_compiler 1
-# these are not defined, they need to be defined here
-%define with()         %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()      %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()           %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without()        %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%endif
-%if "%rhel" > "4"
 %bcond_without gfortran
-%else
-%bcond_with gfortran
 %endif
-%endif
-
 
 # compiler is used to disambiguate package names and executables
 %if %{with gfortran}
-# allows to use a suffix for the library different from the suffix
-# for the utilities
 
-# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
-%define utils_suffix -gfortran
-%if 0%{?g77_default_compiler}
+%define compiler_string -gfortran
+%if 0%{?g77_cernlib_compiler}
 %define compiler -gfortran
-#%%define utils_suffix -gfortran
 %endif
+
 %else
-%if ! 0%{?g77_default_compiler}
+# g77 is used to build the utilities that goes in the packages without
+# suffix.
+%define utils_compiler 1
+%define compiler_string -g77
+%if ! 0%{?g77_cernlib_compiler}
 %define compiler -g77
-# to workaround a bug in 64 bit, we use the utilities from cernlib-g77
-#%%define utils_suffix -g77
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -68,7 +47,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       19%{?dist}
+Release:       20%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -430,17 +409,6 @@
 want to have different compile script and different environments for 
 different versions of the library you have to set them by hand.
 
-%package -n %{?compat}paw%{?utils_suffix}
-Group: Applications/Engineering
-Summary: A program for the analysis and presentation of data
-
-%description -n %{?compat}paw%{?utils_suffix}
-PAW is conceived as an instrument to assist physicists in the analysis and 
-presentation of their data. It provides interactive graphical presentation 
-and statistical or mathematical analysis, working on objects familiar to 
-physicists like histograms, event files (Ntuples), vectors, etc. PAW is 
-based on several components of the CERN Program Library.
-
 %package -n %{?compat}geant321%{?compiler}
 Summary:  Particle detector description and simulation tool
 Group:    Applications/Engineering
@@ -455,12 +423,12 @@
 
 This package includes gxint, the script used to perform this linking step. 
 
-%package -n %{?compat}kuipc%{?utils_suffix}
+%package -n %{?compat}kuipc%{?compiler}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
 Requires: cernlib(devel)
 
-%description -n %{?compat}kuipc%{?utils_suffix}
+%description -n %{?compat}kuipc%{?compiler}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
 the writing of a program's user interface code. It takes as input a Command 
 Definition File (CDF) that describes the commands to be understood by the 
@@ -469,23 +437,67 @@
 with the rest of the program. Since the generated code uses KUIP routines, 
 the program must also be linked against the Packlib library that contains them.
 
-%package -n cernlib-packlib%{?utils_suffix}
+# we want to have both g77 and gfortran suffixed utilities available.
+%package -n %{?compat}paw%{?compiler_string}
+Group: Applications/Engineering
+Summary: A program for the analysis and presentation of data
+
+%description -n %{?compat}paw%{?compiler_string}
+PAW is conceived as an instrument to assist physicists in the analysis and 
+presentation of their data. It provides interactive graphical presentation 
+and statistical or mathematical analysis, working on objects familiar to 
+physicists like histograms, event files (Ntuples), vectors, etc. PAW is 
+based on several components of the CERN Program Library.
+
+%package -n cernlib-packlib%{?compiler_string}
 Group: Applications/Archiving
 Summary: I/O, network and other utilities from the cernlib
 
-%description -n cernlib-packlib%{?utils_suffix}
+%description -n cernlib-packlib%{?compiler_string}
 I/O, network and miscalleneous utilities based on the CERN Program 
 Library. 
 According to the responsible of the cernlib debian package, some
 of these utilities may have security flaws.
 
-%package -n %{?compat}patchy%{?utils_suffix}
+%package -n %{?compat}patchy%{?compiler_string}
 Group: Applications/Archiving
 Summary: The patchy utilities
 
-%description -n %{?compat}patchy%{?utils_suffix}
+%description -n %{?compat}patchy%{?compiler_string}
 Utilities for extracting sources from patchy cards and cradles.
 
+# the package that has utils_compiler set provides the utilities without
+# suffix
+%if 0%{?utils_compiler}
+%package -n paw
+Group: Applications/Engineering
+Summary: A program for the analysis and presentation of data
+
+%description -n paw
+PAW is conceived as an instrument to assist physicists in the analysis and 
+presentation of their data. It provides interactive graphical presentation 
+and statistical or mathematical analysis, working on objects familiar to 
+physicists like histograms, event files (Ntuples), vectors, etc. PAW is 
+based on several components of the CERN Program Library.
+
+%package -n cernlib-packlib
+Group: Applications/Archiving
+Summary: I/O, network and other utilities from the cernlib
+
+%description -n cernlib-packlib
+I/O, network and miscalleneous utilities based on the CERN Program 
+Library. 
+According to the responsible of the cernlib debian package, some
+of these utilities may have security flaws.
+
+%package -n patchy
+Group: Applications/Archiving
+Summary: The patchy utilities
+
+%description -n patchy
+Utilities for extracting sources from patchy cards and cradles.
+%endif
+
 
 %prep
 
@@ -516,13 +528,28 @@
 %patch -P 1200 -p1 -b .script
 # patches for man page
 %patch -P 1206 -p1 -b .man_static
+touch -r %{version}/src/man/man1/cernlib.1.man_static %{version}/src/man/man1/cernlib.1
 
 # debian patchesets
 %patch -P 100001 -p0
 %patch -P 100002 -p0
 %patch -P 100003 -p0
 %patch -P 100004 -p0 
+# we should set the debian files timestamps to the debian patches timestamps
+# but they are not the same for the packages corresponding with different
+# compilers :(. So we use the src/log/tag file.
+#find cernlib-*dfsg* -type f -exec touch -r %{PATCH100001} {} \;
+#find paw-*dfsg* -type f -exec touch -r %{PATCH100002} {} \;
+#find mclibs-*dfsg* -type f -exec touch -r %{PATCH100003} {} \;
+#find geant321-*dfsg* -type f -exec touch -r %{PATCH100004} {} \;
+timestamp=%{_builddir}/%{name}-%{version}/%{version}/src/log/tag
+find cernlib-*dfsg* -type f -exec touch -r $timestamp {} \;
+find paw-*dfsg* -type f -exec touch -r $timestamp {} \;
+find mclibs-*dfsg* -type f -exec touch -r $timestamp {} \;
+find geant321-*dfsg* -type f -exec touch -r $timestamp {} \;
+
 %patch -P 1207 -p1 -b .fedora_desktop
+touch -r paw-*dfsg*/debian/add-ons/misc/paw++.desktop.fedora_desktop paw-*dfsg*/debian/add-ons/misc/paw++.desktop
 
 cp -p cernlib-2006.dfsg.2/debian/add-ons/bin/cernlib.in .
 
@@ -791,9 +818,6 @@
 sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
 
-sed -i.utils_suffix -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{?utils_suffix}:' src/scripts/paw
-sed -i.utils_suffix -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{?utils_suffix}:' src/graflib/dzdoc/dzedit/dzedit.script
-
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
@@ -847,14 +871,10 @@
 FC_OPTFLAGS="%{optflags}"
 FC_COMPILER=gfortran
 %else
-%if 0%{?optflags_for_g77}
-FC_OPTFLAGS="%{optflags}"
-%else
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
 # this is needed (at least in F-8).
 G_LDFLAGS='-Wl,--build-id'
-%endif
 FC_COMPILER=g77
 %endif
 
@@ -981,12 +1001,19 @@
 find patchy -name y* -a -perm -755 -exec %{__install} -p -m755 {} %{buildroot}%{_bindir} ';'
 
 cd %{version}
+# fix generated data file timestamps such that they are the same for all 
+# compilers
+touch -r src/mclibs/cojets/data/cojets.cpp lib/cojets.dat
+touch -r src/mclibs/isajet/data/decay.cpp lib/isajet.dat
+touch -r src/mclibs/eurodec/data/eurodec.dat lib/eurodec.dat
+
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/lib
 %{__install} -d -m755 %{buildroot}%{_datadir}/cernlib/%{version}
 %{__install} -d -m755 %{buildroot}%{_includedir}/cernlib/%{version}
 %{__install} -d -m755 %{buildroot}%{_includedir}/cernlib/%{version}/cfortran
 
 %{__install} -p -m644 lib/*.dat %{buildroot}%{_datadir}/cernlib/%{version}
+ 
 %{__install} -p -m644 lib/gxint321.f %{buildroot}%{_includedir}/cernlib/%{version}
 %{__install} -p -m644 src/cfortran/*.h %{buildroot}%{_includedir}/cernlib/%{version}/
 
@@ -994,25 +1021,37 @@
 
 
 # avoid name conflicts for files in bin
-# first move cernlib and gxint scripts out of the way
-for file in cernlib cernlib-static gxint; do
+# first move kuipc, cernlib and gxint scripts out of the way
+for file in cernlib cernlib-static gxint kuipc; do
    mv %{buildroot}%{_bindir}/$file $file%{?compiler}
 done
 
-# then modify utilities names
-if [ 'z%{?utils_suffix}' != 'z' ]; then
-   for file in %{buildroot}%{_bindir}/*; do
-      mv $file ${file}%{utils_suffix}
-   done
-fi
+# always ship suffixed utilities
+for file in %{buildroot}%{_bindir}/*; do
+   cp -p $file ${file}%{compiler_string}
+   # and not suffixed utilities only for one compiler 
+   if [ 'z%{?utils_compiler}' != 'z1' ]; then
+     rm $file
+   fi
+done
+
 # move gxint and cernlib scripts back
-mv cernlib%{?compiler} cernlib-static%{?compiler} gxint%{?compiler} \
+mv cernlib%{?compiler} cernlib-static%{?compiler} gxint%{?compiler} kuipc%{?compiler}\
    %{buildroot}%{_bindir}/
 
 # add a link to pawX11 and dzeX11 from %{_libdir}/cernlib/%{verdir}/bin
 %{__install} -d -m755 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/
-%{__ln_s} %{_bindir}/pawX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
-%{__ln_s} %{_bindir}/dzeX11%{?utils_suffix} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
+%{__ln_s} %{_bindir}/pawX11%{?compiler_string} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?compiler_string}
+%{__ln_s} %{_bindir}/dzeX11%{?compiler_string} %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?compiler_string}
+
+# fix utilities names in calling scripts
+sed -i -e 's:$GDIR/paw$drv:$GDIR/paw$drv%{compiler_string}:' %{buildroot}%{_bindir}/paw%{compiler_string}
+sed -i -e 's:$GDIR/dze$drv:$GDIR/dze$drv%{compiler_string}:' %{buildroot}%{_bindir}/dzedit%{compiler_string}
+
+%if 0%{?utils_compiler}
+   %{__ln_s} %{_bindir}/pawX11 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/pawX11
+   %{__ln_s} %{_bindir}/dzeX11 %{buildroot}%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%endif
 
 # to preserve symlinks and timestamps
 (cd lib && tar cf - *.a) | (cd %{buildroot}%{_libdir}/cernlib/%{verdir}/lib && tar xf -)
@@ -1037,10 +1076,35 @@
    cp -Rp $dir $base_include/
 done
 
+# patching of header files changed their timestamp. However, since it 
+# is much more complicated, instead of finding the real timestamp, the 
+# source file timestamp is used
+
+pushd $base_include
+for file in cfortran.h comis.h cspack.h geant315.h geant321.h gen.h graflib.h \
+ gxint321.f hbook.h jetset74.h kernlib.h kuip.h  lapack.h lepto62.h minuit.h \
+ packlib.h paw.h zebra.h \
+ comis/cspar.inc comis/cstab64.inc comis/mdpool.* comis/mdsize.h \
+ cspack/hcntpar.inc \
+ geant321/gcnmec.inc \
+ hbook/hcdire.inc hbook/hcntpar.inc \
+ kuip/kstring.h \
+ ntuple/cern_types.h ntuple/c_hcntpar.h \
+ paw/pawsiz.inc; do
+# source file timestamps are not the same for the packages corresponding 
+# with different compilers. So we use the src/log/tag file.
+   #touch -r %{SOURCE0} $file
+   touch -r %{_builddir}/%{name}-%{version}/%{version}/src/log/tag $file
+done
+popd
+
 # substitute the path in installed eufiles.inc, not in in-source
 # file, because in-source the relative path is required for test
+touch -r %{buildroot}%{_includedir}/cernlib/%{version}/eurodec/eufiles.inc __eufiles_timestamp
 sed -i -e 's:eurodec.dat:%{_datadir}/cernlib/%{version}/eurodec.dat:' \
   %{buildroot}%{_includedir}/cernlib/%{version}/eurodec/eufiles.inc
+touch -r __eufiles_timestamp %{buildroot}%{_includedir}/cernlib/%{version}/eurodec/eufiles.inc
+rm __eufiles_timestamp
 
 # install the tree.h and converter.h include files redirecting to 
 # system headers
@@ -1063,12 +1127,18 @@
 %{__install} -d -m755 %{buildroot}/%{_datadir}/X11/app-defaults
 %{__install} -p -m644 ../../*/debian/add-ons/app-defaults/* %{buildroot}/%{_datadir}/X11/app-defaults/
 
-sed -e 's/Exec=paw++/Exec=paw++%{?utils_suffix}/' -e 's/PAW++/PAW++%{?utils_suffix}/' \
- ../../paw*/debian/add-ons/misc/paw++.desktop > paw++%{?utils_suffix}.desktop
+sed -e 's/Exec=paw++/Exec=paw++%{?compiler_string}/' -e 's/PAW++/PAW++%{?compiler_string}/' \
+ ../../paw*/debian/add-ons/misc/paw++.desktop > paw++%{?compiler_string}.desktop
 desktop-file-install --vendor="fedora"               \
   --dir=%{buildroot}/%{_datadir}/applications         \
-  paw++%{?utils_suffix}.desktop
+  --delete-original                                   \
+  paw++%{?compiler_string}.desktop
 
+%if 0%{?utils_compiler}
+desktop-file-install --vendor="fedora"               \
+  --dir=%{buildroot}/%{_datadir}/applications         \
+  ../../paw*/debian/add-ons/misc/paw++.desktop
+%endif
 
 %{__install} -d -m755 %{buildroot}/%{_datadir}/pixmaps
 %{__install} -d -m755 %{buildroot}/%{_datadir}/icons/hicolor/{48x48,32x32}/apps/
@@ -1076,7 +1146,7 @@
 %{__install} -p -m644 ../../paw*/debian/add-ons/icons/paw32x32.xpm %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/paw.xpm
 %{__install} -p -m644 ../../paw*/debian/add-ons/icons/paw48x48.xpm %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/paw.xpm
 
-find %{buildroot}%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
+find %{buildroot}%{_includedir}/cernlib/%{version} -name 'Imakefile*' -exec rm \{\} \;
 rm %{buildroot}%{_includedir}/cernlib/%{version}/ntuple/*.c
 
 
@@ -1117,14 +1187,24 @@
 
 %postun -p /sbin/ldconfig
 
-%post -n %{?compat}paw%{?utils_suffix}
+%post -n %{?compat}paw%{?compiler_string}
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun -n %{?compat}paw%{?compiler_string}
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-%postun -n %{?compat}paw%{?utils_suffix}
+%if 0%{?utils_compiler}
+%post -n paw
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+%postun -n paw
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc cernlib.README debian-copyright
@@ -1161,59 +1241,138 @@
 #%{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
-%files -n %{?compat}paw%{?utils_suffix}
+
+%files -n %{?compat}geant321%{?compiler}
+%defattr(-,root,root,-)
+%{_bindir}/gxint%{?compiler}
+%{_datadir}/X11/app-defaults/*Geant++
+%{_mandir}/man1/gxint.1*
+
+%files -n %{?compat}kuipc%{?compiler}
+%defattr(-,root,root,-)
+%{_bindir}/kuipc%{?compiler}
+%{_mandir}/man1/kuipc.1*
+
+%files -n %{?compat}paw%{?compiler_string}
 %defattr(-,root,root,-)
 %doc paw.README
-%{_bindir}/paw++%{?utils_suffix}
-%{_bindir}/paw%{?utils_suffix}
-%{_bindir}/pawX11%{?utils_suffix}
-%{_bindir}/pawX11.dynamic%{?utils_suffix}
-%{_bindir}/paw++.dynamic%{?utils_suffix}
+%{_bindir}/paw++%{?compiler_string}
+%{_bindir}/paw%{?compiler_string}
+%{_bindir}/pawX11%{?compiler_string}
+%{_bindir}/pawX11.dynamic%{?compiler_string}
+%{_bindir}/paw++.dynamic%{?compiler_string}
 # paw doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?utils_suffix}
+%{_libdir}/cernlib/%{verdir}/bin/pawX11%{?compiler_string}
 %{_datadir}/X11/app-defaults/*Paw++
 %{_datadir}/icons/hicolor/
 %{_mandir}/man1/paw*.1*
-%{_datadir}/applications/*paw*.desktop
+%{_datadir}/applications/*paw++%{?compiler_string}.desktop
 %{_datadir}/pixmaps/paw*.xpm
 
-%files -n %{?compat}geant321%{?compiler}
+%files -n cernlib-packlib%{?compiler_string}
 %defattr(-,root,root,-)
-%{_bindir}/gxint%{?compiler}
-%{_datadir}/X11/app-defaults/*Geant++
-%{_mandir}/man1/gxint.1*
+%doc cernlib-*/debian/debhelper/zftp.README.debian
+%{_bindir}/cdbackup%{?compiler_string}
+%{_bindir}/cdserv%{?compiler_string}
+%{_bindir}/dzedit%{?compiler_string}
+# packlib doesn't explicitly depend on the main package, so it owns the dirs
+%dir %{_libdir}/cernlib/%{verdir}
+%dir %{_libdir}/cernlib/%{verdir}/bin
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?compiler_string}
+%{_bindir}/dzeX11%{?compiler_string}
+%{_bindir}/fatmen%{?compiler_string}
+%{_bindir}/fatsrv%{?compiler_string}
+%{_bindir}/kuesvr%{?compiler_string}
+%{_bindir}/zserv%{?compiler_string}
+%{_bindir}/cdmake%{?compiler_string}
+%{_bindir}/fatnew%{?compiler_string}
+%{_bindir}/pawserv%{?compiler_string}
+%{_bindir}/cdmove%{?compiler_string}
+%{_bindir}/fatback%{?compiler_string}
+%{_bindir}/fatsend%{?compiler_string}
+%{_bindir}/hepdb%{?compiler_string}
+%{_bindir}/kxterm%{?compiler_string}
+%{_bindir}/zftp%{?compiler_string}
+%{_datadir}/X11/app-defaults/KXterm
+%{_datadir}/pixmaps/kxterm*.xpm
+%{_mandir}/man1/kxterm.1* 
+%{_mandir}/man1/dze*.1*
+%{_mandir}/man1/kuesvr.1* 
+%{_mandir}/man1/zftp.1*
+%{_mandir}/man8/*.8*
 
-%files -n %{?compat}kuipc%{?utils_suffix}
+%files -n %{?compat}patchy%{?compiler_string}
 %defattr(-,root,root,-)
-%{_bindir}/kuipc%{?utils_suffix}
-%{_mandir}/man1/kuipc.1*
+%{_bindir}/fcasplit%{?compiler_string}
+%{_bindir}/nycheck%{?compiler_string}
+%{_bindir}/nydiff%{?compiler_string}
+%{_bindir}/nyindex%{?compiler_string}
+%{_bindir}/nylist%{?compiler_string}
+%{_bindir}/nymerge%{?compiler_string}
+%{_bindir}/nypatchy%{?compiler_string}
+%{_bindir}/nyshell%{?compiler_string}
+%{_bindir}/nysynopt%{?compiler_string}
+%{_bindir}/nytidy%{?compiler_string}
+%{_bindir}/yexpand%{?compiler_string}
+%{_bindir}/ycompar%{?compiler_string}
+%{_bindir}/yedit%{?compiler_string}
+%{_bindir}/yfrceta%{?compiler_string}
+%{_bindir}/yindex%{?compiler_string}
+%{_bindir}/yindexb%{?compiler_string}
+%{_bindir}/ylist%{?compiler_string}
+%{_bindir}/ylistb%{?compiler_string}
+%{_bindir}/ypatchy%{?compiler_string}
+%{_bindir}/ysearch%{?compiler_string}
+%{_bindir}/yshift%{?compiler_string}
+%{_bindir}/ytobcd%{?compiler_string}
+%{_bindir}/ytobin%{?compiler_string}
+%{_bindir}/ytoceta%{?compiler_string}
+
+%if 0%{?utils_compiler}
+%files -n paw
+%defattr(-,root,root,-)
+%doc paw.README
+%{_bindir}/paw++
+%{_bindir}/paw
+%{_bindir}/pawX11
+%{_bindir}/pawX11.dynamic
+%{_bindir}/paw++.dynamic
+# paw doesn't explicitly depend on the main package, so it owns the dirs
+%dir %{_libdir}/cernlib/%{verdir}
+%dir %{_libdir}/cernlib/%{verdir}/bin
+%{_libdir}/cernlib/%{verdir}/bin/pawX11
+%{_datadir}/X11/app-defaults/*Paw++
+%{_datadir}/icons/hicolor/
+%{_mandir}/man1/paw*.1*
+%{_datadir}/applications/*paw++.desktop
+%{_datadir}/pixmaps/paw*.xpm
 
-%files -n cernlib-packlib%{?utils_suffix}
+%files -n cernlib-packlib
 %defattr(-,root,root,-)
 %doc cernlib-*/debian/debhelper/zftp.README.debian
-%{_bindir}/cdbackup%{?utils_suffix}
-%{_bindir}/cdserv%{?utils_suffix}
-%{_bindir}/dzedit%{?utils_suffix}
+%{_bindir}/cdbackup
+%{_bindir}/cdserv
+%{_bindir}/dzedit
 # packlib doesn't explicitly depend on the main package, so it owns the dirs
 %dir %{_libdir}/cernlib/%{verdir}
 %dir %{_libdir}/cernlib/%{verdir}/bin
-%{_libdir}/cernlib/%{verdir}/bin/dzeX11%{?utils_suffix}
-%{_bindir}/dzeX11%{?utils_suffix}
-%{_bindir}/fatmen%{?utils_suffix}
-%{_bindir}/fatsrv%{?utils_suffix}
-%{_bindir}/kuesvr%{?utils_suffix}
-%{_bindir}/zserv%{?utils_suffix}
-%{_bindir}/cdmake%{?utils_suffix}
-%{_bindir}/fatnew%{?utils_suffix}
-%{_bindir}/pawserv%{?utils_suffix}
-%{_bindir}/cdmove%{?utils_suffix}
-%{_bindir}/fatback%{?utils_suffix}
-%{_bindir}/fatsend%{?utils_suffix}
-%{_bindir}/hepdb%{?utils_suffix}
-%{_bindir}/kxterm%{?utils_suffix}
-%{_bindir}/zftp%{?utils_suffix}
+%{_libdir}/cernlib/%{verdir}/bin/dzeX11
+%{_bindir}/dzeX11
+%{_bindir}/fatmen
+%{_bindir}/fatsrv
+%{_bindir}/kuesvr
+%{_bindir}/zserv
+%{_bindir}/cdmake
+%{_bindir}/fatnew
+%{_bindir}/pawserv
+%{_bindir}/cdmove
+%{_bindir}/fatback
+%{_bindir}/fatsend
+%{_bindir}/hepdb
+%{_bindir}/kxterm
+%{_bindir}/zftp
 %{_datadir}/X11/app-defaults/KXterm
 %{_datadir}/pixmaps/kxterm*.xpm
 %{_mandir}/man1/kxterm.1* 
@@ -1222,35 +1381,41 @@
 %{_mandir}/man1/zftp.1*
 %{_mandir}/man8/*.8*
 
-%files -n %{?compat}patchy%{?utils_suffix}
+%files -n patchy
 %defattr(-,root,root,-)
-%{_bindir}/fcasplit%{?utils_suffix}
-%{_bindir}/nycheck%{?utils_suffix}
-%{_bindir}/nydiff%{?utils_suffix}
-%{_bindir}/nyindex%{?utils_suffix}
-%{_bindir}/nylist%{?utils_suffix}
-%{_bindir}/nymerge%{?utils_suffix}
-%{_bindir}/nypatchy%{?utils_suffix}
-%{_bindir}/nyshell%{?utils_suffix}
-%{_bindir}/nysynopt%{?utils_suffix}
-%{_bindir}/nytidy%{?utils_suffix}
-%{_bindir}/yexpand%{?utils_suffix}
-%{_bindir}/ycompar%{?utils_suffix}
-%{_bindir}/yedit%{?utils_suffix}
-%{_bindir}/yfrceta%{?utils_suffix}
-%{_bindir}/yindex%{?utils_suffix}
-%{_bindir}/yindexb%{?utils_suffix}
-%{_bindir}/ylist%{?utils_suffix}
-%{_bindir}/ylistb%{?utils_suffix}
-%{_bindir}/ypatchy%{?utils_suffix}
-%{_bindir}/ysearch%{?utils_suffix}
-%{_bindir}/yshift%{?utils_suffix}
-%{_bindir}/ytobcd%{?utils_suffix}
-%{_bindir}/ytobin%{?utils_suffix}
-%{_bindir}/ytoceta%{?utils_suffix}
-
+%{_bindir}/fcasplit
+%{_bindir}/nycheck
+%{_bindir}/nydiff
+%{_bindir}/nyindex
+%{_bindir}/nylist
+%{_bindir}/nymerge
+%{_bindir}/nypatchy
+%{_bindir}/nyshell
+%{_bindir}/nysynopt
+%{_bindir}/nytidy
+%{_bindir}/yexpand
+%{_bindir}/ycompar
+%{_bindir}/yedit
+%{_bindir}/yfrceta
+%{_bindir}/yindex
+%{_bindir}/yindexb
+%{_bindir}/ylist
+%{_bindir}/ylistb
+%{_bindir}/ypatchy
+%{_bindir}/ysearch
+%{_bindir}/yshift
+%{_bindir}/ytobcd
+%{_bindir}/ytobin
+%{_bindir}/ytoceta
+%endif
 
 %changelog
+* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20
+- don't use the same spec for epel4
+- always ship the packages with compiler suffix. This is needed for 
+  proper upgrade path as soon as such a package has been ever shipped
+- fix timestamps
+
 * Mon Aug 27 2007 Patrice Dumas <pertusus at free.fr> 2006-19
 - pass --build-id when linking, this is needed for debuginfo generation
 - use g77 binaries, paw with gfortran is broken on x86_64 (#241416)