packages: udiskie/udiskie.spec - pldize alot

glen glen at pld-linux.org
Fri Oct 22 15:02:44 CEST 2010


Author: glen                         Date: Fri Oct 22 13:02:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- pldize alot

---- Files affected:
packages/udiskie:
   udiskie.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/udiskie/udiskie.spec
diff -u packages/udiskie/udiskie.spec:1.5 packages/udiskie/udiskie.spec:1.6
--- packages/udiskie/udiskie.spec:1.5	Fri Oct 22 12:36:11 2010
+++ packages/udiskie/udiskie.spec	Fri Oct 22 15:02:35 2010
@@ -11,6 +11,7 @@
 URL:		http://bitbucket.org/byronclark/udiskie
 BuildRequires:	asciidoc
 BuildRequires:	rpm-pythonprov >= 4.1-13
+BuildRequires:	rpmbuild(macros) >= 1.219
 Requires:	udisks
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,32 +26,36 @@
 %setup -q
 
 %build
-cd doc
-%{__make}
+%{__python} setup.py build
+
+%{__make} -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8}
+%{__python} setup.py install \
+	--skip-build \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name "*.py" | xargs rm
+%py_postclean
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install bin/udiskie $RPM_BUILD_ROOT%{_bindir}/udiskie
-install bin/udiskie-umount $RPM_BUILD_ROOT%{_bindir}/udiskie-umount
-install doc/%{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -p bin/udiskie $RPM_BUILD_ROOT%{_bindir}/udiskie
+install -p bin/udiskie-umount $RPM_BUILD_ROOT%{_bindir}/udiskie-umount
+cp -a doc/%{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/udiskie
+%attr(755,root,root) %{_bindir}/udiskie-umount
 %{py_sitescriptdir}/%{name}
-%{py_sitescriptdir}/*.egg-info
-%{_mandir}/man8/%{name}*
+%if "%{py_ver}" > "2.4"
+%{py_sitescriptdir}/udiskie-*.egg-info
+%endif
+%{_mandir}/man8/udiskie.8*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -58,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/10/22 13:02:35  glen
+- pldize alot
+
 Revision 1.5  2010/10/22 10:36:11  atler
 - updated to: 0.3.5
 
@@ -74,4 +82,3 @@
 
 Revision 1.1  2010/10/12 22:28:06  atler
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/udiskie/udiskie.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list