diff --git a/.gitignore b/.gitignore index 0c7cb07..e87ed69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cppunit-1.12.1.tar.gz cppunit-1.12.1.tar.gz cppunit-1.13.2.tar.gz +/cppunit-1.14.0.tar.gz diff --git a/0001-Update-FSF-address-in-LGPL-license.patch b/0001-Update-FSF-address-in-LGPL-license.patch deleted file mode 100644 index d257221..0000000 --- a/0001-Update-FSF-address-in-LGPL-license.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/0001-convert-to-UTF-8.patch b/0001-convert-to-UTF-8.patch deleted file mode 100644 index e478a6b..0000000 --- a/0001-convert-to-UTF-8.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a691504d5fb8fada5343252d3ce5bd147c677e50 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 13 Feb 2016 12:52:56 +0100 -Subject: [PATCH] convert to UTF-8 - ---- - NEWS | 2 +- - THANKS | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/NEWS b/NEWS -index b3c4c19..65dd5d8 100644 ---- a/NEWS -+++ b/NEWS -@@ -164,7 +164,7 @@ - Win32DynamicLibraryManager.cpp. - - - MinGW, cygwin: enable build of shared library when using libtool. -- patch #1194394 contributed by Stéphane Fillod. -+ patch #1194394 contributed by Stéphane Fillod. - - - autotool: applied patch #1076398 contributed by Henner Sudek. Quote: - "This patch allows AM_PATH_CPPUNIT to accept version -diff --git a/THANKS b/THANKS -index 89cfa9c..331f916 100644 ---- a/THANKS -+++ b/THANKS -@@ -14,10 +14,10 @@ Lavoie Philippe - Pavel Zabelin - Marco Welti - Thomas Neidhart --Hans Bühler (Dynamic Window library used by MFC UI) -+Hans Bühler (Dynamic Window library used by MFC UI) - John Sisson - Steven Mitter - Stephan Stapel - Abdessattar Sassi (hp-ux plug-in support) - Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) --Vincent Rivière -+Vincent Rivière --- -2.5.0 - diff --git a/cppunit.spec b/cppunit.spec index aa30004..b7f1425 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -1,16 +1,14 @@ -%global apiversion 1.13 +%global apiversion 1.14 Name: cppunit -Version: 1.13.2 -Release: 3%{?dist} +Version: 1.14.0 +Release: 1%{?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 +Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz BuildRequires: doxygen BuildRequires: graphviz @@ -60,7 +58,6 @@ 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 @@ -86,6 +83,9 @@ mv __dist-examples __dist-examples-dir/examples %doc doc/html %changelog +* Tue May 02 2017 David Tardon - 1.14.0-1 +- new upstream release + * Fri Feb 10 2017 Fedora Release Engineering - 1.13.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a405d9c..7e7d5fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz +SHA512 (cppunit-1.14.0.tar.gz) = 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e