SPECS: python-pywm.spec - modular xorg deps (why XFree86-devel is satisifed...

[glen]

Author: glen                         Date: Thu Oct 16 08:32:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- modular xorg deps (why XFree86-devel is satisifed on half of th builders?)
- egg info, adapter; rel 4

---- Files affected:
SPECS:
   python-pywm.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/python-pywm.spec
diff -u SPECS/python-pywm.spec:1.9 SPECS/python-pywm.spec:1.10
--- SPECS/python-pywm.spec:1.9	Tue Oct 14 08:42:51 2008
+++ SPECS/python-pywm.spec	Thu Oct 16 10:32:47 2008
@@ -1,21 +1,21 @@
 # $Revision$, $Date$
-
 %define		module	pywm
-%define 	ver	0-1-6
-
+%define 	ver		0-1-6
 Summary:	Module for WindowMaker docklets
 Summary(pl.UTF-8):	Moduł do tworzenia dokletów dla WindowMakera
 Name:		python-%{module}
 Version:	0.1.6
-Release:	3
+Release:	4
 License:	GPL
 Group:		Development/Languages/Python
 Source0:	http://dl.sourceforge.net/pywmdockapps/pywmdockapps.%{ver}.tar.gz
 # Source0-md5:	e5f1152984862d1cf9925b169c0e8681
 URL:		http://pywmdockapps.sourceforge.net/
-BuildRequires:	XFree86-devel
-BuildRequires:	python-devel >= 1:2.4
+BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	sed >= 4.0
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXpm-devel
 %pyrequires_eq	python-modules
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,22 +56,20 @@
 
 %prep
 %setup -q -n pywmgeneral
-
-sed -i -e 's,/usr/X11R6/lib,/usr/X11R6/%{_lib},' setup.py
+%{__sed} -i -e 's,/usr/X11R6/lib,%{?_x_libraries}%{!?_x_libraries:%{_libdir}},' setup.py
 
 %build
 CFLAGS="%{rpmcflags}"
 export CFLAGS
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT
-
-python setup.py install \
+%{__python} setup.py install \
 	--root=$RPM_BUILD_ROOT --optimize=2
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.py
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +79,9 @@
 %doc README
 %{py_sitedir}/*.py[co]
 %attr(755,root,root) %{py_sitedir}/*.so
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/pywmgeneral-*.egg-info
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -88,6 +89,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008/10/16 08:32:47  glen
+- modular xorg deps (why XFree86-devel is satisifed on half of th builders?)
+- egg info, adapter; rel 4
+
 Revision 1.9  2008/10/14 06:42:51  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-pywm.spec?r1=1.9&r2=1.10&f=u