SPECS: rrdtool.spec - workaround for make problem with ruby module...

qboosh qboosh at pld-linux.org
Sun Oct 14 19:15:42 CEST 2007


Author: qboosh                       Date: Sun Oct 14 17:15:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- workaround for make problem with ruby module
- package .egg-info for python module

---- Files affected:
SPECS:
   rrdtool.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/rrdtool.spec
diff -u SPECS/rrdtool.spec:1.120 SPECS/rrdtool.spec:1.121
--- SPECS/rrdtool.spec:1.120	Thu Sep 20 21:40:00 2007
+++ SPECS/rrdtool.spec	Sun Oct 14 19:15:36 2007
@@ -22,8 +22,8 @@
 BuildRequires:	libpng-devel >= 2:1.2.8
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-devel
+BuildRequires:	python >= 1:2.5
+BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	tcl-devel
@@ -207,7 +207,10 @@
 	--with-perl=%{__perl} \
 	--with-perl-options="INSTALLDIRS=vendor"
 
-%{__make}
+# empty RUBY_MAKE_OPTIONS as workaround for some make weirdness
+# (tried to install without DESTDIR on plain make)
+%{__make} \
+	RUBY_MAKE_OPTIONS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -240,8 +243,8 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/librrd.so
-%{_libdir}/librrd_th.so
+%attr(755,root,root) %{_libdir}/librrd.so
+%attr(755,root,root) %{_libdir}/librrd_th.so
 %{_libdir}/librrd.la
 %{_libdir}/librrd_th.la
 %{_includedir}/rrd.h
@@ -265,6 +268,7 @@
 %files -n python-rrdtool
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/rrdtoolmodule.so
+%{py_sitedir}/py_rrdtool-*.egg-info
 
 %files -n tcl-rrdtool
 %defattr(644,root,root,755)
@@ -277,6 +281,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2007/10/14 17:15:36  qboosh
+- workaround for make problem with ruby module
+- package .egg-info for python module
+
 Revision 1.120  2007/09/20 19:40:00  kosmo
 - updated to 1.2.23
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rrdtool.spec?r1=1.120&r2=1.121&f=u



More information about the pld-cvs-commit mailing list