SPECS: screenlets.spec - unified, fixed broken shellglob

qboosh qboosh at pld-linux.org
Tue Sep 30 23:09:27 CEST 2008


Author: qboosh                       Date: Tue Sep 30 21:09:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified, fixed broken shellglob

---- Files affected:
SPECS:
   screenlets.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/screenlets.spec
diff -u SPECS/screenlets.spec:1.5 SPECS/screenlets.spec:1.6
--- SPECS/screenlets.spec:1.5	Mon Sep 29 21:43:45 2008
+++ SPECS/screenlets.spec	Tue Sep 30 23:09:21 2008
@@ -11,11 +11,11 @@
 URL:		http://www.screenlets.org/
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	rpmbuild(macros) >= 1.234
 Requires(post,postun):	desktop-file-utils
-Requires:	python-pyxdg
 Requires:	python-gnome-desktop-keyring
 Requires:	python-gnome-desktop-libwnck
+Requires:	python-pyxdg
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -30,16 +30,17 @@
 %setup -q -n %{name}
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-python setup.py install \
+%{__python} setup.py install \
 	--optimize=2 \
 	--root $RPM_BUILD_ROOT \
 	--prefix %{_prefix}
 
+# screenlets and screenlets-manager
 %find_lang %{name} --all-name
 
 %py_postclean %{py_sitescriptdir}/%{name}
@@ -60,11 +61,13 @@
 %{_desktopdir}/screenlets-manager.desktop
 %{_iconsdir}/screenlets.svg
 %{py_sitescriptdir}/%{name}
-%{py_sitescriptdir}/%{name}*.egg-info
+%{py_sitescriptdir}/%{name}-*.egg-info
 %{_datadir}/screenlets
 %dir %{_datadir}/screenlets-manager
-%{_datadir}/screenlets-manager/*[!.py]
 %attr(755,root,root) %{_datadir}/screenlets-manager/*.py
+%{_datadir}/screenlets-manager/*.png
+%{_datadir}/screenlets-manager/*.svg
+%{_datadir}/screenlets-manager/prefs.js
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -72,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2008/09/30 21:09:21  qboosh
+- unified, fixed broken shellglob
+
 Revision 1.5  2008/09/29 19:43:45  cieciwa
 - fixed %find_lang call.
 
================================================================

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



More information about the pld-cvs-commit mailing list