diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f474b2b..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -cppunit-1.11.0.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a93fb6d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +cppunit-1.12.0.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index bae13b1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cppunit -# $Id$ -NAME := cppunit -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/cppunit-1.12.0-nolibdir.patch b/cppunit-1.12.0-nolibdir.patch new file mode 100644 index 0000000..4786f13 --- /dev/null +++ b/cppunit-1.12.0-nolibdir.patch @@ -0,0 +1,13 @@ +diff -up cppunit-1.12.0/cppunit-config.in.nolibdir cppunit-1.12.0/cppunit-config.in +--- cppunit-1.12.0/cppunit-config.in.nolibdir 2007-10-21 11:19:40.000000000 +0200 ++++ cppunit-1.12.0/cppunit-config.in 2007-10-21 11:20:01.000000000 +0200 +@@ -87,9 +87,6 @@ if test "$echo_cflags" = "yes"; then + fi + + if test "$echo_libs" = "yes"; then +- if test @libdir@ != /usr/lib ; then +- my_linker_flags="-L@libdir@" +- fi + echo ${my_linker_flags} -lcppunit @LIBADD_DL@ + fi + diff --git a/cppunit.spec b/cppunit.spec index 5617c07..851938f 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,12 +1,14 @@ Name: cppunit -Version: 1.11.0 -Release: 2%{?dist} +Version: 1.12.0 +Release: 4%{?dist}.1 Summary: C++ unit testing framework -License: LGPL +# no license in files +License: LGPLv2+ Group: Development/Libraries Url: http://cppunit.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/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 @@ Test output is in XML for automatic testing and GUI based for supervised tests. %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 @@ programs that use cppunit. %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 @@ the popular doxygen documentation generation tool. %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,28 +78,52 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/DllPlugInTester -%{_mandir}/man1/* -%{_datadir}/aclocal/* -%{_libdir}/libcppunit*.so.* %doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ +%{_bindir}/DllPlugInTester +%{_libdir}/libcppunit*.so.* %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 1.12.0-4.1 +- 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 1.12.0-3 +- add rightly files to -devel (#224106) +- add necessary requires for -devel (#224106) +- ship examples + +* Sun Sep 10 2006 Patrice Dumas 1.12.0-2 +- rebuild for FC6 + +* Wed Jul 5 2006 Patrice Dumas 1.12.0-1 +- update to 1.12 + +* Sun May 21 2006 Patrice Dumas 1.11.6-1 +- update to 1.11.6 + +* Wed Dec 21 2005 Patrice Dumas 1.11.4-1 +- update + * Mon Aug 15 2005 Tom "spot" Callaway 1.11.0-2 - various cleanups -* Mon Jul 4 2005 Patrice Dumas 1.11.0-1 +* Mon Jul 4 2005 Patrice Dumas 1.11.0-1 - update using the fedora template * Sat Apr 14 2001 Bastiaan Bakker diff --git a/sources b/sources index 9a00151..67cd4c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b256f622158d3c932b3c5025ef5e2ed cppunit-1.11.0.tar.gz +7493718733ded49a96cf763c5d3eea7f cppunit-1.12.0.tar.gz