SPECS: R.spec - added bcond_without tests (for make check) - added...

[radek]

Author: radek                        Date: Sat Nov 24 12:25:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond_without tests (for make check)
- added R.pc
- removed /usr/lib/R/share/perl/**.pm

---- Files affected:
SPECS:
   R.spec (1.94 -> 1.95) 

---- Diffs:

================================================================
Index: SPECS/R.spec
diff -u SPECS/R.spec:1.94 SPECS/R.spec:1.95
--- SPECS/R.spec:1.94	Sat Nov 24 12:30:11 2007
+++ SPECS/R.spec	Sat Nov 24 13:25:11 2007
@@ -2,6 +2,7 @@
 
 # Conditional build
 %bcond_without	tcl		# disable tcl support
+%bcond_without	tests		# do not run "make check"
 
 # TODO:
 # - script for rpm to autoprovides/autorequires R internals
@@ -183,7 +184,7 @@
 #	--with-lapack \
 
 %{__make}
-%{__make} check docs help html info
+%{__make} %{?with_tests:check} docs help html info
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -212,6 +213,9 @@
   ln -s %{_libdir}/%{name}/share/perl/Text/$f $RPM_BUILD_ROOT%{perl_vendorlib}/Text/
 done)
 
+rm -r $RPM_BUILD_ROOT%{_libdir}/R/share/perl/{R,File,Text}
+rm -r $RPM_BUILD_ROOT%{perl_vendorlib}/Text
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -256,9 +260,7 @@
 %ghost %{_libdir}/R/doc/html/packages.html
 %{_desktopdir}/*.desktop
 
-%dir %{perl_vendorlib}/R
-%{perl_vendorlib}/R/*
-%{perl_vendorlib}/Text/*
+%{perl_vendorlib}/R
 
 %attr(755,root,root) %{_libdir}/%{name}/modules
 
@@ -290,6 +292,8 @@
 %{_libdir}/%{name}/library/tools
 %{_libdir}/%{name}/library/utils
 
+%{_pkgconfigdir}/*.pc
+
 %files recommended
 %defattr(644,root,root,755)
 
@@ -299,6 +303,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2007-11-24 12:25:11  radek
+- added bcond_without tests (for make check)
+- added R.pc
+- removed /usr/lib/R/share/perl/**.pm
+
 Revision 1.94  2007-11-24 11:30:11  radek
 - version 2.6.0 (NFY)
 - removed --with-lapack (build hangs for whatever reason)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/R.spec?r1=1.94&r2=1.95&f=u