From b8f63c42632677c58124fbd4ab32ee644c7669a7 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 13 Feb 2016 08:43:51 +0100 Subject: [PATCH] switch to new upstream --- .gitignore | 1 + 0001-Update-FSF-address-in-LGPL-license.patch | 28 +++++++++++++++++++ cppunit-msg.patch | 24 ---------------- cppunit-warnings-sf2912630.patch | 22 --------------- cppunit.spec | 25 ++++++++--------- sources | 2 +- 6 files changed, 41 insertions(+), 61 deletions(-) create mode 100644 0001-Update-FSF-address-in-LGPL-license.patch delete mode 100644 cppunit-msg.patch delete mode 100644 cppunit-warnings-sf2912630.patch diff --git a/.gitignore b/.gitignore index 7a13705..0c7cb07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz +cppunit-1.13.2.tar.gz diff --git a/0001-Update-FSF-address-in-LGPL-license.patch b/0001-Update-FSF-address-in-LGPL-license.patch new file mode 100644 index 0000000..d257221 --- /dev/null +++ b/0001-Update-FSF-address-in-LGPL-license.patch @@ -0,0 +1,28 @@ +From 1cebdfc97b39961c2df68e84996f667d529eafc7 Mon Sep 17 00:00:00 2001 +From: Thorsten Behrens +Date: Tue, 12 Nov 2013 08:59:19 +0100 +Subject: [PATCH] Update FSF address in LGPL license. + +Since rpmlint was bitching, and indeed +http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt features a +new address. +--- + COPYING | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/COPYING b/COPYING +index b1e3f5a..0a41847 100644 +--- a/COPYING ++++ b/COPYING +@@ -2,7 +2,7 @@ + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +-- +2.5.0 + diff --git a/cppunit-msg.patch b/cppunit-msg.patch deleted file mode 100644 index d5c1568..0000000 --- a/cppunit-msg.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 deleted file mode 100644 index 7b0ba8a..0000000 --- a/cppunit-warnings-sf2912630.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 534add4..866103f 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,17 +1,14 @@ Name: cppunit -Version: 1.12.1 -Release: 17%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: C++ unit testing framework # no license in files License: LGPLv2+ -Url: http://cppunit.sourceforge.net/ -Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz +Url: https://www.freedesktop.org/wiki/Software/cppunit/ +Source: http://dev-www.libreoffice.org/src/%{name}-%{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 +Patch1: 0001-Update-FSF-address-in-LGPL-license.patch BuildRequires: doxygen, graphviz @@ -39,25 +36,22 @@ the popular doxygen documentation generation tool. %prep %setup -q %patch0 -p1 -b .nolibdir +%patch1 -p1 -b .fsf-address for file in THANKS ChangeLog NEWS; do iconv -f latin1 -t utf8 < $file > ${file}.utf8 touch -c -r $file ${file}.utf8 mv ${file}.utf8 $file done -%patch1 -p1 -b .nomsg -%patch2 -p1 -b .warnings-sf2912630 -%patch3 -p1 -b .aarch64 %build -export LDFLAGS=-ldl -%configure --enable-doxygen --disable-static +%configure --enable-doxygen --disable-static --disable-silent-rules make %{?_smp_mflags} %install 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}/doc/cppunit +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/cppunit $RPM_BUILD_ROOT%{_datadir}/%{name}/html # ensure that timestamp of cppunit-config is the same for all arches touch -c -r cppunit-config.in.nolibdir $RPM_BUILD_ROOT%{_bindir}/cppunit-config @@ -96,6 +90,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* 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 26c71ca..a405d9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd30e9cf5523cdfc019b94f5e1d7fd19 cppunit-1.12.1.tar.gz +d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz