rpms/cernlib/devel cernlib.spec,1.32,1.33

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Thu Aug 31 21:59:14 UTC 2006 

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5699

Modified Files:
	cernlib.spec 
Log Message:
* Thu Aug 31 2006 Patrice Dumas <pertusus at free.fr> - 2005-22
- add -q to %setup
- rebuild against lesstif for FC6



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cernlib.spec	24 May 2006 21:11:47 -0000	1.32
+++ cernlib.spec	31 Aug 2006 21:59:14 -0000	1.33
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       21%{?dist}
+Release:       22%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,7 +12,12 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
+%if "%fedora" > "5"
+BuildRequires: lesstif-devel
+%else
 BuildRequires: openmotif-devel
+%endif
+
 %if "%fedora" <= "3"
 BuildRequires: lapack blas
 %else
@@ -37,7 +42,7 @@
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
 # and cernlib-deadpool.txt to recreate them from the upstream
-# In a directoory with the cernlib sources, issue 
+# In a directory with the cernlib sources, issue 
 # sh cernlib-remove-deadpool 
 Source3: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_geant321.tar.gz
 Source4: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_graflib.tar.gz
@@ -234,7 +239,11 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      openmotif-devel
+%if "%fedora" > "5"
+BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
 %if "%fedora" <= "3"
 Requires:       lapack blas
 %else
@@ -327,24 +336,24 @@
 
 
 %prep
-%setup -c 
-%setup -T -D -a 2
-%setup -T -D -a 3
-%setup -T -D -a 4
-%setup -T -D -a 5
-%setup -T -D -a 6
-%setup -T -D -a 7
-%setup -T -D -a 8
-%setup -T -D -a 9
-%setup -T -D -a 10
-%setup -T -D -a 11
-%setup -T -D -a 12
-%setup -T -D -a 14
-%setup -T -D -a 15
-%setup -T -D -a 17
+%setup -q -c 
+%setup -q -T -D -a 2
+%setup -q -T -D -a 3
+%setup -q -T -D -a 4
+%setup -q -T -D -a 5
+%setup -q -T -D -a 6
+%setup -q -T -D -a 7
+%setup -q -T -D -a 8
+%setup -q -T -D -a 9
+%setup -q -T -D -a 10
+%setup -q -T -D -a 11
+%setup -q -T -D -a 12
+%setup -q -T -D -a 14
+%setup -q -T -D -a 15
+%setup -q -T -D -a 17
 
 # patch patchy 4 installer fortran generator script
-# avtually it is unusefull, because the unpacking has been done
+# actually it is unusefull, because the unpacking has been done
 # offline, see comment above.
 #%patch -P 1500
 
@@ -840,58 +849,62 @@
 
 
 %changelog
-* Wed May 24 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-21
+* Thu Aug 31 2006 Patrice Dumas <pertusus at free.fr> - 2005-22
+- add -q to %%setup
+- rebuild against lesstif for FC6
+
+* Wed May 24 2006 Patrice Dumas <pertusus at free.fr> - 2005-21
 - compile paw statically against the cernlib (paw binaries dynamically 
   compiled against the cernlib are still shiped). Fix 192866
 
-* Wed May 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-20
+* Wed May 17 2006 Patrice Dumas <pertusus at free.fr> - 2005-20
 - use new debian patchset. Fix 191631
 
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-19
+* Tue Apr 13 2006 Patrice Dumas <pertusus at free.fr> - 2005-19
 - add a patch to yexpand, to avoid using $HOME.
 
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+* Tue Apr 13 2006 Patrice Dumas <pertusus at free.fr> - 2005-17
 - npatchy don't build on ppc.
 
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
+* Wed Apr 12 2006 Patrice Dumas <pertusus at free.fr> - 2005-16
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
+* Tue Apr 11 2006 Patrice Dumas <pertusus at free.fr> - 2005-15.1
 - add conditionals in spec to have only one for all fedora versions.
 
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
+* Tue Apr 11 2006 Patrice Dumas <pertusus at free.fr> - 2005-14
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset
 
-* Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-13
+* Thu Feb 16 2006 Patrice Dumas <pertusus at free.fr> - 2005-13
 - rebuild for fc5
 
-* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12.1
+* Tue Jan 17 2006 Patrice Dumas <pertusus at free.fr> - 2005-12.1
 - attempt a rebuild against newer openmotif
 
-* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4
+* Tue Dec 20 2005 Patrice Dumas <pertusus at free.fr> - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint
 
-* Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-10
+* Tue Dec 20 2005 Patrice Dumas <pertusus at free.fr> - 2005-10
 - add file in /etc/ld.so.conf.d required for dynamic linking
 
-* Wed Dec 14 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-9.1
+* Wed Dec 14 2005 Patrice Dumas <pertusus at free.fr> - 2005-9.1
 - use new debian patchset
 
-* Fri Dec  9 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-8.1
+* Fri Dec  9 2005 Patrice Dumas <pertusus at free.fr> - 2005-8.1
 - use new debian patchset
 - enable 64 bit fixes patch
 
-* Fri Dec  2 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-7
+* Fri Dec  2 2005 Patrice Dumas <pertusus at free.fr> - 2005-7
 - use updated beta debian patchset
 - remove the BSD in the licence because there is no library nor binary
   under a BSD licence and someone could get the idea that there is 
   some dual BSD/GPL licenced binaries or libraries. The LGPL is kept
   because of cfortran
 
-* Tue Nov 29 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-6.1
+* Tue Nov 29 2005 Patrice Dumas <pertusus at free.fr> - 2005-6.1
 - update with newer debian patchset for cernlib, fix licence issues
 - don't use the include.tar.gz source, instead get include files from
   the source files
@@ -899,17 +912,17 @@
 - simplify the scripts modifications
 - add BuildRequires: libXau-devel to workaround #173530
 
-* Tue Nov 15 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4
+* Tue Nov 15 2005 Patrice Dumas <pertusus at free.fr> - 2005-4
 - add a .csh file
 - correct defaults in cernlib scripts
 
-* Sun Sep 11 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-3
+* Sun Sep 11 2005 Patrice Dumas <pertusus at free.fr> - 2005-3
 - add rm -rf $RPM_BUILD_ROOT
 
-* Thu Sep  1 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-2
+* Thu Sep  1 2005 Patrice Dumas <pertusus at free.fr> - 2005-2
 - minor update of cernlib.README
 - modify the cernlib script patch to use /usr/X11R6/lib64 if existing
 
-* Tue Jun 09 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-1
+* Tue Jun 09 2005 Patrice Dumas <pertusus at free.fr> - 2005-1
 - full rewrite of the spec file from Scientific Linux
 - use some ideas and many patches from debian cernlib

More information about the fedora-extras-commits mailing list