SPECS: python-gnome-desktop.spec - use system waf and waf/__waf rp...
qboosh
qboosh at pld-linux.org
Tue Mar 25 21:18:44 CET 2008
Author: qboosh Date: Tue Mar 25 20:18:44 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use system waf and waf/__waf rpm macros to use optflags
- use waf -v build to avoid hiding compiler commands
---- Files affected:
SPECS:
python-gnome-desktop.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: SPECS/python-gnome-desktop.spec
diff -u SPECS/python-gnome-desktop.spec:1.33 SPECS/python-gnome-desktop.spec:1.34
--- SPECS/python-gnome-desktop.spec:1.33 Tue Mar 25 19:51:32 2008
+++ SPECS/python-gnome-desktop.spec Tue Mar 25 21:18:38 2008
@@ -34,7 +34,9 @@
BuildRequires: python-gnome-devel >= %{gnome_python_req}
BuildRequires: python-pycairo-devel
BuildRequires: python-pygtk-devel >= %{pygtk_req}
+BuildRequires: rpmbuild(macros) >= 1.336
%{?with_totem:BuildRequires: totem-pl-parser-devel >= 1.6.0}
+BuildRequires: waf
%pyrequires_eq python-modules
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -248,22 +250,23 @@
%setup -q -n %{module}-%{version}
%build
-./waf configure \
+%waf configure \
--prefix %{_prefix} \
--libdir %{_libdir}
-./waf build
+%{__waf} -v build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-./waf install \
+%{__waf} install \
--destdir $RPM_BUILD_ROOT
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
rm -f $RPM_BUILD_ROOT%{py_sitedir}/gtk-2.0/{{*.la,*.py},*/{*.la,*.py}}
+# wscript doesn't allow to pass proper gtk-doc dir
if [ ! -d $RPM_BUILD_ROOT%{_gtkdocdir} ]; then
install -d $RPM_BUILD_ROOT%{_gtkdocdir}
mv $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
@@ -353,6 +356,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2008-03-25 20:18:38 qboosh
+- use system waf and waf/__waf rpm macros to use optflags
+- use waf -v build to avoid hiding compiler commands
+
Revision 1.33 2008-03-25 18:51:32 sls
- move apidocs to _gtkdocdir from _datadir/gtk-doc/html
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-gnome-desktop.spec?r1=1.33&r2=1.34&f=u
More information about the pld-cvs-commit
mailing list