rpms/rss-glx/F-7 rss-glx.spec,1.10,1.11

Nils Philippsen (nphilipp) fedora-extras-commits at redhat.com
Fri Oct 19 13:33:12 UTC 2007


Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv971

Modified Files:
	rss-glx.spec 
Log Message:
let -xscreensaver require xscreensaver-gl-base (#336331)
prefix xscreensaver symlinks with "rss-glx-" as well (#318611)
prefix binaries with "rss-glx-" (#250180)
don't ship README.xscreensaver (#200881)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-7/rss-glx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rss-glx.spec	15 Sep 2007 08:35:35 -0000	1.10
+++ rss-glx.spec	19 Oct 2007 13:32:39 -0000	1.11
@@ -36,7 +36,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 11%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -88,6 +88,9 @@
 %else
 Requires: xscreensaver-base < 1:5.03-3
 %endif
+%if %{?fedora}%{!fedora} >= 7
+Requires: xscreensaver-gl-base
+%endif
 
 %description xscreensaver
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -168,8 +171,9 @@
 %build
 autoconf
 %configure \
-	--with-configdir=%{xssconfigdir} \
-	--with-kdessconfigdir=%{kdessconfigdir}
+    --with-configdir=%{xssconfigdir} \
+    --with-kdessconfigdir=%{kdessconfigdir} \
+    --program-prefix=rss-glx-
 make %{?_smp_mflags}
 
 %install
@@ -178,28 +182,30 @@
 	while read line; do
 %if %gss
         # generate GNOME screensaver desktop files
-		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"" $2 "\"; desc=\"" $3 "\""}')
+		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"rss-glx-" $2 "\"; desc=\"" $3 "\""}')
 		trycmd="${cmd%%%% *}"
-		cat << EOF > %{buildroot}%{_gssconfigdir}/rss-glx-${cmd}.desktop
+        origtrycmd="${trycmd#rss-glx-}"
+		cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
 
 [Desktop Entry]
 Encoding=UTF-8
 Name=${name}
 Comment=${desc}
-TryExec=rss-glx-${trycmd}
-Exec=rss-glx-${cmd} -r
+TryExec=${trycmd}
+Exec=${cmd} -r
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=Screensaver
 EOF
-		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/rss-glx-${trycmd}"
+		ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/${trycmd}"
 %endif
         # fix KDE screensaver desktop files
         pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
-        mv -f "${trycmd}.desktop" "${trycmd}.desktop.orig"
-        awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${trycmd}.desktop.orig" > "${trycmd}.desktop"
-        rm -f "${trycmd}.desktop.orig"
+        if [ ! -f "${trycmd}.desktop" ]; then
+            awk '{if ($0 ~ "^Actions=") { print "Actions=InWindow;Root;Setup;"; print "X-KDE-Category=Really Slick Screensavers"; print "X-KDE-Type=OpenGL"; } else { print; }}' < "${origtrycmd}.desktop" > "${trycmd}.desktop"
+            rm -f "${origtrycmd}.desktop"
+        fi
         popd >& /dev/null
         # external hacks description and symlinks for XScreenSaver
         cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
@@ -262,7 +268,7 @@
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING INSTALL README README.xscreensaver
+%doc ChangeLog COPYING INSTALL README
 %doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.1-0.8.1.p.diff
 %{_bindir}/*
 %{_mandir}/*/*
@@ -290,6 +296,18 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Fri Oct 19 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-15
+- let -xscreensaver require xscreensaver-gl-base (#336331)
+
+* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-14
+- prefix xscreensaver symlinks with "rss-glx-" as well (#318611)
+
+* Tue Oct 02 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-13
+- prefix binaries with "rss-glx-" (#250180)
+
+* Mon Oct 01 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-12
+- don't ship README.xscreensaver (#200881)
+
 * Sat Sep 15 2007 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-11
 - enable modular xscreensaver support for Fedora 7 and later (#200881)
 - include %%post/%%postun scripts only with modular xscreensaver support




More information about the fedora-extras-commits mailing list