diff --git a/.gitignore b/.gitignore index e6867c9..e73f789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ /unittest-cpp-1.4-c42e68b.tar.gz /unittest-cpp-e76d25a01c91b38ff8a5182dd690360186136ce7.tar.gz /unittest-cpp-1.4-e76d25a.tar.gz +/unittest-cpp-1.6.0-b69b63a.tar.gz +/unittest-cpp-1.6.1-b69b63a.tar.gz +/unittest-cpp-2.0.0-b69b63a.tar.gz +/unittest-cpp-2.0.0.tar.gz diff --git a/fix_version_2.0.0.patch b/fix_version_2.0.0.patch new file mode 100644 index 0000000..f7249fc --- /dev/null +++ b/fix_version_2.0.0.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.69]) + AC_INIT([UnitTest++], +- m4_esyscmd_s([git describe --tags | cut -c2-]), ++ [2.0.0], + [pjohnmeyer@gmail.com], + [unittest-cpp]) + + diff --git a/sources b/sources index 91c6a77..1905b5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13826b0994044280f45d03542a0778be unittest-cpp-1.4-e76d25a.tar.gz +SHA512 (unittest-cpp-2.0.0.tar.gz) = 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab diff --git a/unittest++.pc b/unittest++.pc deleted file mode 100644 index 045baa3..0000000 --- a/unittest++.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix= -exec_prefix= -libdir= -includedir= - -Name: unittest++ -Description: unittest-cpp is a unit testing framework for C++ -Version: 1.4.0 -Requires: -Conflicts: -Libs: -L${libdir} -lUnitTest++ -Cflags: -I${includedir}/UnitTest++ diff --git a/unittest-cpp.spec b/unittest-cpp.spec index 02c3173..1b07cd7 100644 --- a/unittest-cpp.spec +++ b/unittest-cpp.spec @@ -1,30 +1,21 @@ - %global _hardened_build 1 -%global commit e76d25a01c91b38ff8a5182dd690360186136ce7 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20130823 -%global gitversion .%{commitdate}git%{shortcommit} %global oldname UnitTest++ Name: unittest-cpp -# 1.4 is the last version of the old sf.net project. -Version: 1.4 -# so we're postrelease. -Release: 15%{gitversion}%{?dist} +Version: 2.0.0 +Release: 23%{?dist} Summary: Lightweight unit testing framework for C++ License: MIT -Group: Development/Libraries -# old Url: http://sf.net/projects/unittest-cpp URL: https://github.com/%{name}/%{name} -Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz - -# unittest++.pc file courtesy of Luke Benstead -Source1: unittest++.pc - +Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz # documentation from 1.4 tarball: docs/UnitTest++.html -Source2: %{name}.html +Source1: %{name}.html +# Fix configure.ac version test +Patch0: fix_version_2.0.0.patch +BuildRequires: make +BuildRequires: gcc-c++ BuildRequires: autoconf BuildRequires: libtool @@ -35,7 +26,6 @@ very important aspects of %{name}. %package devel Summary: Object files for development using %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -44,7 +34,6 @@ necessary for developing test programs. %package static Summary: Static library for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description static @@ -52,60 +41,138 @@ The %{name}-static package contains the object files necessary for statically linking test programs. %prep -%setup -q -n %{name}-%{commit} -cp -p %SOURCE1 %SOURCE2 . +%autosetup -p1 +cp -p %SOURCE1 . # autoreconf will complain about missing NEWS and README files touch NEWS ln README.md README # autoreconf will add a GPLv3 license text in COPYING ln LICENSE COPYING -mkdir m4 autoreconf -i %build %configure # rpmlint unused-direct-shlib-dependency sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# fill out our .pc template -sed -i -e " - s,^prefix=,prefix=%{_prefix},g - s,^exec_prefix=,exec_prefix=%{_exec_prefix},g - s,^libdir=,libdir=%{_libdir},g - s,^includedir=,includedir=%{_includedir},g - " unittest++.pc -make %{?_smp_mflags} +%make_build %check make check %install -mkdir -p %{buildroot}%{_includedir}/%{name} -mkdir -p %{buildroot}%{_libdir} -mkdir -p %{buildroot}%{_datadir}/pkgconfig -make DESTDIR=%{buildroot} install -install -p -m 644 unittest++.pc %{buildroot}%{_datadir}/pkgconfig/ +%make_install rm -f %{buildroot}%{_libdir}/lib%{oldname}.la %files -%doc AUTHORS LICENSE README.md -%{_libdir}/lib%{oldname}.so.* +%doc AUTHORS README.md +%license LICENSE +%{_libdir}/lib%{oldname}.so.2* %files devel -%doc %{name}.html +%doc %{name}.html %{_includedir}/%{oldname} %{_libdir}/lib%{oldname}.so -%{_datadir}/pkgconfig/unittest++.pc +%{_libdir}/pkgconfig/UnitTest++.pc %files static %{_libdir}/lib%{oldname}.a -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %changelog -* Sun Nov 24 2013 François Cami - 1.4-15.20130823gite76d25a -- f18-only build fix. +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 2.0.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.0.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 2.0.0-11 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Feb 14 2020 Leigh Scott - 2.0.0-9 +- Update to 2.0.0 release + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jun 10 2017 Raphael Groner - 2.0.0-1 +- new version + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jun 07 2016 Raphael Groner - 1.6.1-1 +- bump to v1.6.1, rhbz#1333400 + +* Mon Mar 28 2016 François Cami - 1.6.0-1.20160301gitb69b63a +- Update to 1.6.0 + drop our .pc file (ship upstream's instead). + +* Fri Feb 05 2016 Fedora Release Engineering - 1.4-19.20130823gite76d25a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.4-18.20130823gite76d25a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.4-17.20130823gite76d25a +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 1.4-16.20130823gite76d25a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.4-15.20130823gite76d25a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Fri Nov 22 2013 Luke Benstead - 1.4-14.20130823gite76d25a - Fix .spec file after previous change