rpms/xscreensaver/FC-5 xscreensaver.spec,1.76,1.77

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/xscreensaver/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9602

Modified Files:
	xscreensaver.spec 
Log Message:
re-enable fix-man-pages patch (#182552)
introduce -gss subpackages for gnome-screensaver compatibility (#204944, changes backported from Fedora Extras package by Mamoru Tasaka)
add disttag



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/FC-5/xscreensaver.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- xscreensaver.spec	24 Mar 2006 22:39:10 -0000	1.76
+++ xscreensaver.spec	5 Sep 2006 20:35:31 -0000	1.77
@@ -6,7 +6,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release: 	2
+Release: 	3%{?dist}
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -66,6 +66,18 @@
 BuildRequires: libGLU-devel, libGL-devel
 Requires: libGL, libGLU
 
+%package extras-gss
+Summary:    Desktop files of extras for gnome-screensaver
+Group:      Amusements/Graphics
+Requires:   %{name}-extras = %{epoch}:%{version}-%{release}
+Requires:   gnome-screensaver
+
+%package gl-extras-gss
+Summary:    Desktop files of gl-extras for gnome-screensaver
+Group:      Amusements/Graphics
+Requires:   %{name}-gl-extras = %{epoch}:%{version}-%{release}
+Requires:   gnome-screensaver
+
 %description
 A modular screen saver and locker for the X Window System.
 More than 200 display modes are included in this package.
@@ -88,13 +100,21 @@
 savers for your mind-numbing, ambition-eroding, time-wasting,
 hypnotized viewing pleasure.
 
+%description extras-gss
+This package contains desktop files of extras screensavers
+for gnome-screensaver compatibility.
+
+%description gl-extras-gss
+This package contains desktop files of gl-extras screensavers
+for gnome-screensaver compatibility.
+
 %prep
 %setup -q
 %patch0 -p1 -b .change-defaults
 %patch1 -p1 -b .sanitize-hacks
 #%patch2 -p1 -b .dont-ping-if-not-root
 %patch3 -p1 -b .use-hack-basename
-#%patch4 -p1 -b .fix-man-pages
+%patch4 -p1 -b .fix-man-pages
 %patch5 -p1 -b .dont-allow-root
 %patch6 -p1 -b .pam-include
 %patch8 -p1 -b .write-explicit-dirname
@@ -221,6 +241,54 @@
 %find_lang %{name}
 cat %{name}.lang >> $dd/base.files
 
+# Create desktop entry for gnome-screensaver
+create_desktop(){
+   set +x
+   COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
+   NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
+   ARG=`cat $1 | sed -n -e 's|^.*<command arg=\"\([^ ][^ ]*\)\".*$|\1|p'`
+   COMMENT="`cat $1 | sed -e '1,/_description/d' | \
+     sed -e '/_description/q' | sed -e '/_description/d'`"
+   COMMENT=`echo $COMMENT`
+
+   if [ x$NAME = x ] ; then NAME=$COMMAND ; fi
+
+   rm -f $2
+   echo "[Desktop Entry]" >> $2
+   echo "Encoding=UTF-8" >> $2
+   echo "Name=$NAME" >> $2
+   echo "Comment=$COMMENT" >> $2
+   echo "TryExec=$COMMAND" >> $2
+   echo "Exec=$COMMAND $ARG" >> $2
+   echo "StartupNotify=false" >> $2
+   echo "Type=Application" >> $2
+   echo "Categories=Screensaver" >> $2
+   set -x
+}
+
+SAVERDIR=%{_datadir}/gnome-screensaver/themes
+mkdir -p ${RPM_BUILD_ROOT}${SAVERDIR}
+
+pushd $dd
+for list in *extras.files ; do
+
+   glist=gnome-$list
+   rm -f $glist
+
+   echo "%%defattr(-,root,root)" > $glist
+   echo "%%dir $SAVERDIR" >> $glist
+
+   for xml in `cat $list | grep xml$` ; do
+      file=${RPM_BUILD_ROOT}${xml}
+      desktop=xscreensaver-`basename $file`
+      desktop=${desktop%.xml}.desktop
+
+      create_desktop $file  ${RPM_BUILD_ROOT}${SAVERDIR}/$desktop
+      echo ${SAVERDIR}/$desktop >> $glist
+   done
+done
+popd
+
 # Make sure all files are readable by all, and writable only by owner.
 #
 chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
@@ -246,7 +314,19 @@
 %files -f gl-extras.files gl-extras
 %defattr(-,root,root)
 
+%files -f gnome-extras.files extras-gss
+%defattr(-,root,root)
+
+%files -f gnome-gl-extras.files gl-extras-gss
+%defattr(-,root,root)
+
 %changelog
+* Tue Sep 05 2006 Nils Philippsen <nphilipp at redhat.com> - 1:4.24-3
+- re-enable fix-man-pages patch (#182552)
+- introduce -gss subpackages for gnome-screensaver compatibility (#204944,
+  changes backported from Fedora Extras package by Mamoru Tasaka)
+- add disttag
+
 * Fri Mar 24 2006 Ray Strode <rstrode at redhat.com> - 1:4.24-2
 - add patch from jwz to reap zombie processes (bug 185833)