rpms/rss-glx/devel rss-glx.spec,1.26,1.27

Nils Philippsen (nphilipp) fedora-extras-commits at redhat.com
Thu May 29 09:56:05 UTC 2008


Author: nphilipp

Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8445

Modified Files:
	rss-glx.spec 
Log Message:
use correct binary names for KDE (#448844)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rss-glx.spec	29 May 2008 09:02:07 -0000	1.26
+++ rss-glx.spec	29 May 2008 09:55:19 -0000	1.27
@@ -78,6 +78,7 @@
 BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: gawk
+BuildRequires: sed
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -97,7 +98,7 @@
 %else
 Requires: xscreensaver-base < 1:5.03-3
 %endif
-%if %{?fedora}%{!fedora} >= 7
+%if 0%{?fedora} >= 7
 Requires: xscreensaver-gl-base
 %endif
 
@@ -217,7 +218,7 @@
         # fix KDE screensaver desktop files
         pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
         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"
+            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" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2 at g' > "${trycmd}.desktop"
             rm -f "${origtrycmd}.desktop"
         fi
         popd >& /dev/null
@@ -313,6 +314,7 @@
 * Thu May 29 2008 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-20
 - use %%bcond, %%with macros for consistency
 - don't use quotes around %%fedora macro to make it work with Fedora 10
+- use correct binary names for KDE (#448844)
 
 * Wed Apr 02 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.1.p-19
 - -kde: drop Requires: kdebase (kdeartwork dep is enough)




More information about the scm-commits mailing list