- remove libdir reference to cppunit-config, should fix multiarch conflict

(#340951)
- fix encoding and remove windows related files in examples
- keep timestamps
This commit is contained in:
pertusus 2007-12-16 23:52:14 +00:00
parent 8c7ba060db
commit 3418da02b6

View File

@ -1,6 +1,6 @@
Name: cppunit Name: cppunit
Version: 1.12.0 Version: 1.12.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: C++ unit testing framework Summary: C++ unit testing framework
# no license in files # no license in files
@ -30,7 +30,6 @@ programs that use cppunit.
%package doc %package doc
Summary: HTML formatted API documention for cppunit Summary: HTML formatted API documention for cppunit
Group: Documentation Group: Documentation
Requires: %{name} = %{version}-%{release}
%description doc %description doc
The cppunit-doc package contains HTML formatted API documention generated by The cppunit-doc package contains HTML formatted API documention generated by
@ -40,24 +39,26 @@ the popular doxygen documentation generation tool.
%setup -q %setup -q
%patch0 -p1 -b .nolibdir %patch0 -p1 -b .nolibdir
for file in THANKS ChangeLog NEWS; do for file in THANKS ChangeLog NEWS; do
touch -r $file __timestamp_$file
iconv -f latin1 -t utf8 < $file > ${file}.utf8 iconv -f latin1 -t utf8 < $file > ${file}.utf8
touch -r $file ${file}.utf8
mv ${file}.utf8 $file mv ${file}.utf8 $file
touch -r __timestamp_$file $file
rm __timestamp_$file
done done
%build %build
export LDFLAGS=-ldl
%configure --enable-doxygen --disable-static %configure --enable-doxygen --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT 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 rm $RPM_BUILD_ROOT%{_libdir}/*.la
# remove double of doc # remove double of doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit 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 # clean up examples
rm -rf __dist-examples __dist-examples-dir rm -rf __dist-examples __dist-examples-dir
cp -a examples __dist-examples cp -a examples __dist-examples
@ -96,10 +97,11 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/html/ %doc doc/html/
%changelog %changelog
* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3 * Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-4
- remove libdir reference to cppunit-config, should fix multiarch conflict - remove libdir reference to cppunit-config, should fix multiarch conflict
(#340951) (#340951)
- fix encoding and remove windows related files in examples - fix encoding and remove windows related files in examples
- keep timestamps
* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3 * Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.12.0-3
- add rightly files to -devel (#224106) - add rightly files to -devel (#224106)