packages: gtest/gtest.spec - disable tests (they fail) - samples to example...

[glen]

Author: glen                         Date: Thu Apr 22 19:32:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable tests (they fail)
- samples to examples dir
- note about libtool hacking

---- Files affected:
packages/gtest:
   gtest.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/gtest/gtest.spec
diff -u packages/gtest/gtest.spec:1.1 packages/gtest/gtest.spec:1.2
--- packages/gtest/gtest.spec:1.1	Thu Apr 22 21:28:00 2010
+++ packages/gtest/gtest.spec	Thu Apr 22 21:32:21 2010
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	tests		# build without tests.
+%bcond_with	tests		# build without tests.
 
 Summary:	Google C++ testing framework
 Name:		gtest
@@ -34,14 +34,14 @@
 %setup -q
 
 # Keep a clean copy of samples.
-cp -pr samples samples.orig
+cp -a samples examples
 
 %build
 %configure \
 	--disable-static
 
 # Omit unused direct shared library dependencies.
-# XXX: in pld libtool is patched?
+# XXX: patch pld libtool, currently without this sed -lm is generated on package deps
 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 
 %{__make}
@@ -55,12 +55,10 @@
 	INSTALL="%{__install} -p" \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# Restore the clean copy of samples.
-# To be later listed against %doc.
-rm -rf samples
-cp -a samples.orig samples
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,15 +76,14 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc samples
 %attr(755,root,root) %{_bindir}/%{name}-config
-%{_aclocaldir}/%{name}.m4
 %{_libdir}/libgtest.so
 %{_libdir}/libgtest_main.so
-
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*.h
 %{_includedir}/%{name}/internal
+%{_aclocaldir}/%{name}.m4
+%{_examplesdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -94,5 +91,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/22 19:32:21  glen
+- disable tests (they fail)
+- samples to examples dir
+- note about libtool hacking
+
 Revision 1.1  2010/04/22 19:28:00  glen
 - new, based on fc repo
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtest/gtest.spec?r1=1.1&r2=1.2&f=u