diff --git a/.gitignore b/.gitignore index 0c7cb07..7a13705 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz -cppunit-1.13.2.tar.gz diff --git a/cppunit-msg.patch b/cppunit-msg.patch new file mode 100644 index 0000000..d5c1568 --- /dev/null +++ b/cppunit-msg.patch @@ -0,0 +1,24 @@ +--- cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:26.514477964 +0200 ++++ cppunit-1.12.1/include/cppunit/Message.h 2010-10-08 14:02:15.411948098 +0200 +@@ -57,6 +57,8 @@ public: + const std::string &detail2, + const std::string &detail3 ); + ++ ~Message(); ++ + Message &operator =( const Message &other ); + + /*! \brief Returns the short description. +--- cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:39.421768852 +0200 ++++ cppunit-1.12.1/src/cppunit/Message.cpp 2010-10-08 14:02:54.066829633 +0200 +@@ -47,6 +47,10 @@ Message::Message( const std::string &sho + addDetail( detail1, detail2, detail3 ); + } + ++Message::~Message() ++{ ++} ++ + Message & + Message::operator =( const Message &other ) + { diff --git a/cppunit-warnings-sf2912630.patch b/cppunit-warnings-sf2912630.patch new file mode 100644 index 0000000..7b0ba8a --- /dev/null +++ b/cppunit-warnings-sf2912630.patch @@ -0,0 +1,22 @@ +--- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100 ++++ cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100 +@@ -151,9 +151,7 @@ + #include + #endif + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- BOOL APIENTRY DllMain( HANDLE hModule, \ +- DWORD ul_reason_for_call, \ +- LPVOID lpReserved ) \ ++ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ + { \ + return TRUE; \ + } \ +@@ -162,7 +160,7 @@ + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- int main( int argc, char *argv[] ) \ ++ int main( int, char *[] ) \ + { \ + return 0; \ + } \ diff --git a/cppunit.spec b/cppunit.spec index a3b55bd..5918e9d 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,16 +1,21 @@ -%global apiversion 1.13 +%global apiversion 1.12 Name: cppunit -Version: 1.13.2 -Release: 2%{?dist} +Version: 1.12.1 +Release: 17%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ -Url: https://www.freedesktop.org/wiki/Software/cppunit/ -Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.gz -Patch0: 0001-Update-FSF-address-in-LGPL-license.patch -Patch1: 0001-convert-to-UTF-8.patch +Url: http://cppunit.sourceforge.net/ +Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz +Patch0: cppunit-1.12.0-nolibdir.patch +Patch1: cppunit-msg.patch +#https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795 +Patch2: cppunit-warnings-sf2912630.patch +Patch3: cppunit-aarch64.patch +Patch4: 0001-Update-FSF-address-in-LGPL-license.patch +Patch5: 0001-convert-to-UTF-8.patch BuildRequires: doxygen BuildRequires: graphviz @@ -51,8 +56,9 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' rm %{buildroot}%{_libdir}/*.la # remove double of doc rm -rf %{buildroot}%{_datadir}/doc/cppunit %{buildroot}%{_datadir}/%{name}/html -# remove unused cppunit-config -rm -f %{buildroot}%{_bindir}/cppunit-config %{buildroot}%{_mandir}/man1/cppunit-config.1* %{buildroot}%{_datadir}/aclocal/cppunit.m4 + +# ensure that timestamp of cppunit-config is the same for all arches +touch -c -r configure %{buildroot}%{_bindir}/cppunit-config # clean up examples rm -rf __dist-examples __dist-examples-dir @@ -72,12 +78,15 @@ mv __dist-examples __dist-examples-dir/examples %doc AUTHORS NEWS README THANKS TODO BUGS doc/FAQ %license COPYING %{_bindir}/DllPlugInTester -%{_libdir}/libcppunit-%{apiversion}.so.0 -%{_libdir}/libcppunit-%{apiversion}.so.0.* +%{_libdir}/libcppunit-%{apiversion}.so.1 +%{_libdir}/libcppunit-%{apiversion}.so.1.* %files devel +%{_bindir}/cppunit-config %{_includedir}/cppunit %{_libdir}/libcppunit.so +%{_datadir}/aclocal/cppunit.m4 +%{_mandir}/man1/cppunit-config.1* %{_libdir}/pkgconfig/cppunit.pc %files doc @@ -86,12 +95,6 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog -* Sat Feb 13 2016 David Tardon - 1.13.2-2 -- drop obsolete cppunit-config - -* Sat Feb 13 2016 David Tardon - 1.13.2-1 -- switch to new upstream - * Wed Feb 03 2016 Fedora Release Engineering - 1.12.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index a405d9c..26c71ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz +bd30e9cf5523cdfc019b94f5e1d7fd19 cppunit-1.12.1.tar.gz