rpms/cppunit/devel cppunit.spec,1.9,1.10

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cppunit.spec 
Log Message:
* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-4
- remove libdir reference to cppunit-config, should fix multiarch conflict
  (#340951)
- fix encoding and remove windows related files in examples
- keep timestamps



Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/cppunit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cppunit.spec	21 Oct 2007 10:13:31 -0000	1.9
+++ cppunit.spec	16 Dec 2007 23:52:14 -0000	1.10
@@ -1,6 +1,6 @@
 Name: cppunit
 Version: 1.12.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Summary: C++ unit testing framework
 # no license in files
@@ -30,7 +30,6 @@
 %package doc
 Summary: HTML formatted API documention for cppunit
 Group: Documentation
-Requires: %{name} = %{version}-%{release}
 
 %description doc
 The cppunit-doc package contains HTML formatted API documention generated by
@@ -40,24 +39,26 @@
 %setup -q
 %patch0 -p1 -b .nolibdir
 for file in THANKS ChangeLog NEWS; do
-   touch -r $file __timestamp_$file
    iconv -f latin1 -t utf8 < $file > ${file}.utf8
+   touch -r $file ${file}.utf8
    mv ${file}.utf8 $file
-   touch -r __timestamp_$file $file
-   rm __timestamp_$file
 done
 
 %build
+export LDFLAGS=-ldl
 %configure --enable-doxygen --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove double of doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit
 
+# ensure that timestamp of cppunit-config is the same for all arches
+touch -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config
+
 # clean up examples
 rm -rf __dist-examples __dist-examples-dir
 cp -a examples __dist-examples
@@ -96,10 +97,11 @@
 %doc doc/html/
 
 %changelog
-* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-3
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-4
 - remove libdir reference to cppunit-config, should fix multiarch conflict
   (#340951)
 - fix encoding and remove windows related files in examples
+- keep timestamps
 
 * Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 1.12.0-3
 - add rightly files to -devel (#224106)