rpms/xscreensaver/devel xscreensaver.spec,1.26,1.27

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10219

Modified Files:
	xscreensaver.spec 
Log Message:
* Tue Sep  5 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-19
- Create desktop files for gnome-screensaver (bug #204944)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xscreensaver.spec	28 Aug 2006 08:26:30 -0000	1.26
+++ xscreensaver.spec	5 Sep 2006 15:51:27 -0000	1.27
@@ -1,7 +1,7 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	18
+%define fedora_rel	19
 
 %define fedora_ver	5.91.1
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -74,6 +74,19 @@
 Obsoletes: 	xscreensaver-gl
 BuildRequires: 	libGLU-devel, libGL-devel
 
+%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.
@@ -96,6 +109,16 @@
 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 
 
@@ -238,6 +261,7 @@
 # This function prints a list of things that get installed.
 # It does this by parsing the output of a dummy run of "make install".
 list_files() {
+  echo "%%defattr(-,root,root)"
   make -s install_prefix=${RPM_BUILD_ROOT} INSTALL=true "$@"	\
    | sed -e 's|directory* \([^ ][^ ]*\)$|/%%dir\1|'		\
    | sed -n -e 's at .* \(/[^ ]*\)$@\1 at p'				\
@@ -287,6 +311,54 @@
    fi
 done
 
+# 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
+}
+
+cd $dd
+
+SAVERDIR=%{_datadir}/applications/screensavers
+mkdir -p ${RPM_BUILD_ROOT}${SAVERDIR}
+
+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
+
 # Make sure all files are readable by all, and writable only by owner.
 #
 chmod -R a+r,u+w,og-w ${RPM_BUILD_ROOT}
@@ -303,7 +375,16 @@
 %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  5 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-19
+- Create desktop files for gnome-screensaver (bug #204944)
+
 * Mon Aug 28 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-18
 - Unify locale releated patches.