SPECS: waf.spec - run py_postclean, restore path.patch

glen glen at pld-linux.org
Sat Oct 4 18:14:17 CEST 2008


Author: glen                         Date: Sat Oct  4 16:14:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- run py_postclean, restore path.patch

---- Files affected:
SPECS:
   waf.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/waf.spec
diff -u SPECS/waf.spec:1.14 SPECS/waf.spec:1.15
--- SPECS/waf.spec:1.14	Sat Oct  4 18:01:04 2008
+++ SPECS/waf.spec	Sat Oct  4 18:14:12 2008
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	System budowania Waf
 Name:		waf
 Version:	1.4.4
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Building
 Source0:	http://waf.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	6a809e446497b710592579772c8b22bd
+Patch0:		%{name}-path.patch
 URL:		http://code.google.com/p/waf/
 BuildRequires:	python
 BuildArch:	noarch
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 ./waf-light configure \
@@ -41,8 +43,9 @@
 	--prefix %{_prefix} \
 	--destdir $RPM_BUILD_ROOT
 
-%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-*
-%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-*
+%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
+%py_ocomp $RPM_BUILD_ROOT%{_libdir}/%{name}
+%py_postclean %{_libdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,11 +54,11 @@
 %defattr(644,root,root,755)
 %doc README TODO
 %attr(755,root,root) %{_bindir}/waf
-%dir %{_libdir}/%{name}-%{version}-*
-%dir %{_libdir}/%{name}-%{version}-*/wafadmin
-%{_libdir}/%{name}-%{version}-*/wafadmin/*.py[co]
-%dir %{_libdir}/%{name}-%{version}-*/wafadmin/Tools
-%{_libdir}/%{name}-%{version}-*/wafadmin/Tools/*.py[co]
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/wafadmin
+%{_libdir}/%{name}/wafadmin/*.py[co]
+%dir %{_libdir}/%{name}/wafadmin/Tools
+%{_libdir}/%{name}/wafadmin/Tools/*.py[co]
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -63,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2008/10/04 16:14:12  glen
+- run py_postclean, restore path.patch
+
 Revision 1.14  2008/10/04 16:01:04  glen
 - unify
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/waf.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list