rpms/cppunit/devel cppunit.spec,1.7,1.8

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cppunit.spec 
Log Message:
* 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



Index: cppunit.spec
===================================================================
RCS file: /cvs/extras/rpms/cppunit/devel/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	29 Jan 2007 10:55:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name: cppunit
 Version: 1.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Summary: C++ unit testing framework
 License: LGPL
@@ -18,6 +18,7 @@
 %package devel
 Summary: Libraries and headers for cppunit development
 Group: Development/Libraries
+Requires: pkgconfig, automake
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -37,15 +38,24 @@
 %setup -q
 
 %build
-%configure --enable-doxygen
+%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
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
 # remove double of doc
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit
+rm -rf $RPM_BUILD_ROOT%{_datadir}/cppunit
+
+# 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 \) -exec rm {} \;
+mkdir dist-examples-dir
+mv dist-examples dist-examples-dir/examples
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,25 +66,30 @@
 
 %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 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