Accepting request 288229 from M17N

1

OBS-URL: https://build.opensuse.org/request/show/288229
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/googletest?expand=0&rev=7

googletest.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Feb 28 13:29:29 UTC 2015 - mpluskal@suse.com
+
+- Correct typo in library name
+
+-------------------------------------------------------------------
+Fri Feb 27 18:04:48 UTC 2015 - mpluskal@suse.com
+
+- Use source url
+- Package libraries as libgoogletest0
+- Run tests when building
+
 -------------------------------------------------------------------
 Sun Jul  6 06:27:04 UTC 2014 - i@marguerite.su
 

googletest.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package googletest
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
 #
 
 
+%define libname lib%{name}0
 Name:           googletest
 Version:        1.7.0
 Release:        0
@@ -23,11 +24,10 @@ Summary:        Google C++ Testing Framework
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            http://code.google.com/p/googletest/
-Source0:        gtest-%{version}.zip
+Source0:        https://googletest.googlecode.com/files/gtest-%{version}.zip
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org Google thinks `make install`
 #is dangerous, but I don't think so.
-Patch:          googletest-enable-make-install.patch
-BuildRequires:  cmake
+Patch0:         googletest-enable-make-install.patch
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  python
@@ -42,10 +42,24 @@ a rich set of assertions, user-defined assertions, death tests,
 fatal and non-fatal failures, value- and type-parameterized tests,
 various options for running the tests, and XML test report generation.
 
+%package	-n %{libname}
+Summary:        Google C++ Testing Framework
+Group:          Development/Libraries/C and C++
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
+
+%description	-n %{libname}
+Google\'s framework for writing C++ tests on a variety of platforms
+(Linux, Mac OS X, Windows, Cygwin, Windows CE, and Symbian).
+Based on the xUnit architecture. Supports automatic test discovery,
+a rich set of assertions, user-defined assertions, death tests,
+fatal and non-fatal failures, value- and type-parameterized tests,
+various options for running the tests, and XML test report generation.
+
 %package        devel
 Summary:        Development files for googletest
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %{libname} = %{version}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -53,23 +67,30 @@ developing applications that use googletest.
 
 %prep
 %setup -q -n gtest-%{version}
-%patch -p1
+%patch0 -p1
 autoreconf -fi
 
 %build
-%configure --disable-static
+%configure \
+	--enable-static=no
 make %{?_smp_mflags}
 
+%if 0%{?suse_version} > 1310
+%check
+make check %{?_smp_mflags}
+%endif
+
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 scripts/gtest-config %{buildroot}%{_bindir}
-find %{buildroot}%{_libdir} -name "*.la" -type f -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%files
+%postun -n %{libname} -p /sbin/ldconfig
+
+%files -n %{libname}
 %defattr(-, root, root)
 %doc README LICENSE CONTRIBUTORS CHANGES
 %{_libdir}/libgtest.so.0