rpms/cppunit/EL-5 cppunit.spec,1.7,1.8
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Mon Dec 17 19:56:35 UTC 2007
- Previous message (by thread): rpms/cppunit/EL-4 .cvsignore, 1.2, 1.3 cppunit.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ganglia/F-7 .cvsignore, 1.4, 1.5 ganglia.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/cppunit/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12581/EL-5
Modified Files:
cppunit.spec
Log Message:
sync with devel
Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/EL-5/cppunit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cppunit.spec 10 Sep 2006 22:13:58 -0000 1.7
+++ cppunit.spec 17 Dec 2007 19:55:57 -0000 1.8
@@ -1,12 +1,14 @@
Name: cppunit
Version: 1.12.0
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: C++ unit testing framework
-License: LGPL
+# no license in files
+License: LGPLv2+
Group: Development/Libraries
Url: http://cppunit.sourceforge.net/
-Source: http://download.sf.net/cppunit/cppunit-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
+Patch0: cppunit-1.12.0-nolibdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz
@@ -18,6 +20,7 @@
%package devel
Summary: Libraries and headers for cppunit development
Group: Development/Libraries
+Requires: pkgconfig, automake
Requires: %{name} = %{version}-%{release}
%description devel
@@ -27,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
@@ -35,17 +37,37 @@
%prep
%setup -q
+%patch0 -p1 -b .nolibdir
+for file in THANKS ChangeLog NEWS; do
+ iconv -f latin1 -t utf8 < $file > ${file}.utf8
+ touch -r $file ${file}.utf8
+ mv ${file}.utf8 $file
+done
%build
-%configure --enable-doxygen
+export LDFLAGS=-ldl
+%configure --enable-doxygen --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+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
+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
+make -C __dist-examples distclean
+# Makefile.am files are left as documentation
+find __dist-examples \( -name Makefile.in -o -name .cvsignore -o -name '*.dsw' -o -name '*.dsp' \) -exec rm {} \;
+chmod a-x __dist-examples/qt/run.bat
+mkdir __dist-examples-dir
+mv __dist-examples __dist-examples-dir/examples
%clean
rm -rf $RPM_BUILD_ROOT
@@ -56,25 +78,36 @@
%files
%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%{_bindir}/DllPlugInTester
-%{_mandir}/man1/*
-%{_datadir}/aclocal/*
%{_libdir}/libcppunit*.so.*
-%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
%files devel
%defattr(-,root,root,-)
%{_bindir}/cppunit-config
%{_includedir}/cppunit
-%{_libdir}/libcppunit.a
%{_libdir}/libcppunit.so
+%{_datadir}/aclocal/cppunit.m4
+%{_mandir}/man1/cppunit-config.1*
%{_libdir}/pkgconfig/cppunit.pc
%files doc
%defattr(-,root,root,-)
-%doc doc/html/*
+%doc __dist-examples-dir/examples/
+%doc doc/html/
%changelog
+* 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)
+- add necessary requires for -devel (#224106)
+- ship examples
+
* Sun Sep 10 2006 Patrice Dumas <pertusus at free.fr> 1.12.0-2
- rebuild for FC6
- Previous message (by thread): rpms/cppunit/EL-4 .cvsignore, 1.2, 1.3 cppunit.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ganglia/F-7 .cvsignore, 1.4, 1.5 ganglia.spec, 1.6, 1.7 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list