.gitignore

@@ -3,5 +3,3 @@
 /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

fix_version_2.0.0.patch

@@ -1,12 +0,0 @@
---- 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])
- 
-

sources

@@ -1 +1 @@
-SHA512 (unittest-cpp-2.0.0.tar.gz) = 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
+037da7ba592b7124e6689378b128b92b  unittest-cpp-1.6.1-b69b63a.tar.gz

unittest-cpp.spec

@@ -1,21 +1,29 @@
+
 %global         _hardened_build 1
+%global         commit      b69b63ac2bf4a967b35e853026abb68b3f8442ad
+%global         shortcommit %(c=%{commit}; echo ${c:0:7})
+%global         commitdate  20160301
+%global         gitversion  .%{commitdate}git%{shortcommit}
 %global         oldname     UnitTest++
 
 Name:           unittest-cpp
-Version:        2.0.0
-Release:        23%{?dist}
+Version:        1.6.1
+Release:        2%{?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:        %url/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+
+# 2013: unittest++.pc file courtesy of Luke Benstead
+# 2016: upstream ships its own file instead.
+#Source1:        unittest++.pc
+
 # documentation from 1.4 tarball: docs/UnitTest++.html
-Source1:        %{name}.html
-# Fix configure.ac version test
-Patch0:         fix_version_2.0.0.patch
+Source2:        %{name}.html
 
-BuildRequires: make
-BuildRequires:  gcc-c++
 BuildRequires:  autoconf
 BuildRequires:  libtool
 
@@ -26,6 +34,7 @@ very important aspects of %{name}.
 
 %package devel
 Summary:        Object files for development using %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -34,6 +43,7 @@ necessary for developing test programs.
 
 %package static
 Summary:        Static library for %{name}
+Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description static
@@ -41,115 +51,60 @@ The %{name}-static package contains the object files
 necessary for statically linking test programs.
 
 %prep
-%autosetup -p1
-cp -p %SOURCE1 .
+%setup -q -n %{name}-%{commit}
+#cp -p %SOURCE1 %SOURCE2 .
+cp -p %SOURCE2 .
 # 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
 autoreconf -i
+# upstream https://github.com/unittest-cpp/unittest-cpp/issues/105
+sed -i -e "s,pkgincludedir\ =\ \$(includedir)\/UnitTest++\/,pkgincludedir\ =\ \$(includedir)\/,g" Makefile.in
 
 %build
 %configure
 # rpmlint unused-direct-shlib-dependency
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-%make_build
+# 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}
 
 %check
 make check
 
 %install
-%make_install
+#mkdir -p %{buildroot}%{_libdir}
+#mkdir -p %{buildroot}%{_datadir}/pkgconfig
+make DESTDIR=%{buildroot} install
+#install -p -m 644 unittest++.pc %{buildroot}%{_datadir}/pkgconfig/
 rm -f %{buildroot}%{_libdir}/lib%{oldname}.la
 
 %files
-%doc AUTHORS README.md
-%license LICENSE
-%{_libdir}/lib%{oldname}.so.2*
+%doc AUTHORS LICENSE README.md 
+%{_libdir}/lib%{oldname}.so.*
 
 %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
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-11
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Feb 14 2020 Leigh Scott <leigh123linux@gmail.com> - 2.0.0-9
-- Update to 2.0.0 release 
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Jun 10 2017 Raphael Groner <projects.rg@smart.ms> - 2.0.0-1
-- new version
-
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild