- updated to 2.0.0 (note: new soname)

- added sh patch (avoid bashism)

diff --git a/unittest-cpp-sh.patch b/unittest-cpp-sh.patch
new file mode 100644 (file)
index 0000000..e06d0b3
--- /dev/null
+++ b/unittest-cpp-sh.patch
@@ -0,0 +1,11 @@
+--- unittest-cpp-2.0.0/configure.ac.orig       2017-01-13 23:09:09.000000000 +0100
++++ unittest-cpp-2.0.0/configure.ac    2017-06-22 20:22:34.081053773 +0200
+@@ -19,7 +19,7 @@
+ 
+ dnl Detect Windows, as it doesn't implement UNIX signals and requires special code
+ AM_CONDITIONAL([WINDOWS],
+-               [test "${host//mingw/}" != "${host}" -o "${host//msvc/}" != "${host}"])
++               [echo "$host" | grep -E 'mingw|msvc'])
+ 
+ LT_INIT()
+ 

diff --git a/unittest-cpp.spec b/unittest-cpp.spec
index c5ba8ada45653d865fad8c1229b5995c65646500..b4338172c5d3af4242ed95ceef4799e6faa0fed9 100644 (file)
--- a/unittest-cpp.spec
+++ b/unittest-cpp.spec
@@ -1,44 +1,74 @@
-%bcond_without tests
+#
+# Conditional build:
+%bcond_without tests   # check target
+#
 Summary:       Lightweight unit testing framework for C++
+Summary(pl.UTF-8):     Lekki szkielet testów jednostkowych dla C++
 Name:          unittest-cpp
-Version:       1.6.1
+Version:       2.0.0
 Release:       1
 Group:         Libraries
 License:       MIT
-URL:           https://github.com/unittest-cpp/unittest-cpp
+#Source0Download: https://github.com/unittest-cpp/unittest-cpp/releases
 Source0:       https://github.com/unittest-cpp/unittest-cpp/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b4849a686b78ba198a51a49966b8ddba
-BuildRequires: autoconf
-BuildRequires: libtool
+# Source0-md5: 48f4fa972c5b1462098f8a4352b5d0cc
+Patch0:                %{name}-sh.patch
+URL:           https://github.com/unittest-cpp/unittest-cpp
+BuildRequires: autoconf >= 2.69
+BuildRequires: automake >= 1:1.11
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:2
+BuildRequires: sed >= 4.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-%{name} is a lightweight unit testing framework for C++. Simplicity,
-portability, speed, and small footprint are all very important aspects
-of %{name}.
+UnitTest++ is a lightweight unit testing framework for C++.
+Simplicity, portability, speed, and small footprint are all very
+important aspects of UnitTest++.
 
 %package devel
-Summary:       Object files for development using %{name}
+Summary:       Development files for UnitTest++
+Summary(pl.UTF-8):     Pliki programistyczne biblioteki UnitTest++
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains the object files necessary for
-developing test programs.
+This package contains the development files necessary for developing
+test programs.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki programistyczne potrzebne do tworzenia
+programów testowych.
 
 %package static
-Summary:       Static library for %{name}
+Summary:       Static UnitTest++ library
+Summary(pl.UTF-8):     Statyczna biblioteka UnitTest++
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-The %{name}-static package contains the object files necessary for
-statically linking test programs.
+This package contains static library necessary for statically linking
+test programs.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera bibliotekę statyczną potrzebną do statycznego
+linkowania programów testowych.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# git data not available, hardcode released package version
+%{__sed} -i -e 's/m4_esyscmd_s.*git describe --tags.*/[%{version}],/' configure.ac
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-silent-rules
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -49,24 +79,24 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libUnitTest++.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libUnitTest++.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
-%attr(755,root,root) %{_libdir}/libUnitTest++.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libUnitTest++.so.1
+%attr(755,root,root) %{_libdir}/libUnitTest++.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libUnitTest++.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/UnitTest++
 %attr(755,root,root) %{_libdir}/libUnitTest++.so
+%{_includedir}/UnitTest++
 %{_pkgconfigdir}/UnitTest++.pc
 
 %files static