packages: python-dbus/python-dbus.spec - rel 4; be compatible with PyQt4 db...

[arekm]

Author: arekm                        Date: Sat Aug 29 19:03:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; be compatible with PyQt4 dbus/mainloop

---- Files affected:
packages/python-dbus:
   python-dbus.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/python-dbus/python-dbus.spec
diff -u packages/python-dbus/python-dbus.spec:1.25 packages/python-dbus/python-dbus.spec:1.26
--- packages/python-dbus/python-dbus.spec:1.25	Sat Aug 29 20:42:55 2009
+++ packages/python-dbus/python-dbus.spec	Sat Aug 29 21:02:58 2009
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Biblioteka do używania D-BUS oparta o Pythona
 Name:		python-dbus
 Version:	0.83.0
-Release:	3
+Release:	4
 License:	MIT
 Group:		Libraries/Python
 Source0:	http://dbus.freedesktop.org/releases/dbus-python/%{rname}-%{version}.tar.gz
@@ -64,14 +64,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{py_sitedir}/dbus/mainloop
+# use sitedir instead of sitescriptdir to match PyQt4 dbus/mainloop dir
 
 %{__make} install \
+	pythondir=%{py_sitedir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-touch $RPM_BUILD_ROOT%{py_sitedir}/dbus/__init__.py
-touch $RPM_BUILD_ROOT%{py_sitedir}/dbus/mainloop/__init__.py
-
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -84,17 +82,13 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%dir %{py_sitescriptdir}/dbus
-%dir %{py_sitescriptdir}/dbus/mainloop
-%{py_sitescriptdir}/*.py[co]
-%{py_sitescriptdir}/dbus/*.py[co]
-%{py_sitescriptdir}/dbus/mainloop/*.py[co]
-%attr(755,root,root) %{py_sitedir}/_dbus*.so
 %dir %{py_sitedir}/dbus
 %dir %{py_sitedir}/dbus/mainloop
+%{py_sitedir}/*.py[co]
 %{py_sitedir}/dbus/*.py[co]
 %{py_sitedir}/dbus/mainloop/*.py[co]
-#%{py_sitescriptdir}/dbus_python-*.egg-info
+%attr(755,root,root) %{py_sitedir}/_dbus*.so
+#%{py_sitedir}/dbus_python-*.egg-info
 
 %files devel
 %defattr(644,root,root,755)
@@ -107,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2009/08/29 19:02:58  arekm
+- rel 4; be compatible with PyQt4 dbus/mainloop
+
 Revision 1.25  2009/08/29 18:42:55  arekm
 - rel 3; init files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-dbus/python-dbus.spec?r1=1.25&r2=1.26&f=u