Merge pull request #605 from microsoft/lihl/cppunit

[dev] Fix runtime requirement for cppunit-devel

SPECS/cppunit/cppunit.spec

@@ -1,20 +1,20 @@
-Summary:	C++ port of Junit test framework
-Name:		cppunit
-Version:	1.12.1
-Release:        5%{?dist}
-License:	LGPLv2
-URL:		https://sourceforge.net/projects/cppunit/
-Source0:	https://sourceforge.net/projects/cppunit/files/%{name}/%{version}/%{name}-%{version}.tar.gz
 %define sha1 cppunit=f1ab8986af7a1ffa6760f4bacf5622924639bf4a
-Group:		Development/Tools
+Summary:        C++ port of Junit test framework
+Name:           cppunit
+Version:        1.12.1
+Release:        6%{?dist}
+License:        LGPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Group:          Development/Tools
+URL:            https://sourceforge.net/projects/cppunit/
+Source0:        https://sourceforge.net/projects/cppunit/files/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  libgcc
 BuildRequires:  libtool
+BuildRequires:  make
 
 %description
 CppUnit is the C++ port of the famous JUnit framework for unit testing. Test
@@ -24,11 +24,13 @@ supervised tests
 %package devel
 Summary:        cppunit devel
 Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+
 %description devel
 This contains headers and libs for development with cppunit.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %build
 export LDFLAGS="`echo " %{build_ldflags} " | sed 's/ -Wl,--as-needed//'`"
@@ -38,7 +40,7 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install
-find %{buildroot} -name '*.la' -delete
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %files
 %defattr(-,root,root)
@@ -52,16 +54,23 @@ find %{buildroot} -name '*.la' -delete
 %{_libdir}/libcppunit.a
 %{_libdir}/libcppunit.so
 %{_libdir}/pkgconfig*
-/usr/share/*
+%{_datadir}/*
 
 %changelog
+* Mon Feb 08 2021 Henry Li <lihl@microsoft.com> - 1.12.1-6
+- Add cppunit as Requires for cppunit-devel
+
 *   Thu Jun 11 2020 Henry Beberman <henry.beberman@microsoft.com> - 1.12.1-5
 -   Disable link as-needed to fix compilation errors updated ldflags.
+
 *   Sat May 09 00:21:26 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.12.1-4
 -   Added %%license line automatically
+
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 1.12.1-3
 -   Initial CBL-Mariner import from Photon (license: Apache2).
+
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.12.1-2
 -   Use standard configure macros
+
 *   Sun Mar 26 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.12.1-1
 -   Initial version of cppunit for Photon.