rpms/xscreensaver/devel xscreensaver.spec,1.84,1.85

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32283

Modified Files:
	xscreensaver.spec 
Log Message:
* Mon Feb  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-6
- Remove OnlyShowIn=GNOME on F-11+ (to make happy with XFCE):
  bug 483495
- Add more comments about bug reference



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- xscreensaver.spec	22 Jan 2009 14:02:45 -0000	1.84
+++ xscreensaver.spec	2 Feb 2009 12:12:48 -0000	1.85
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 
 %define extrarel      %{nil}
 
@@ -31,9 +31,14 @@
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
+# bug 129335
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
+# Change webcollage not to access to net
+# Also see bug 472061
 Patch21:         xscreensaver-5.07-webcollage-default-nonet.patch
+# Reported from upstream
 Patch50:         xscreensaver-5.08-po-recreate.patch
+# bug 481146
 Patch51:         xscreensaver-5.08-phosphor-segv.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -236,7 +241,8 @@
    mv $f.tmp $f
 done
 
-# change some options
+# Change some options
+# For grabDesktopImages, lock, see bug 126809
 change_option driver/XScreenSaver.ad.in \
    captureStderr=False \
    passwdTimeout=0:00:15 \
@@ -246,11 +252,12 @@
    ignoreUninstalledPrograms=True \
    textProgram=fortune\ -s
 
-# silence the following hacks by default
+# Disable the following hacks by default
+# (disable, not remove)
 silence_hack driver/XScreenSaver.ad.in \
    bsod flag
 
-# record time, version
+# Record time, EVR
 eval sed -i.ver \
    -e \'s\|version \[45\]\.\[0-9a-z\]\[0-9a-z\]\*\|version %{version}-`echo \
       %{release} | sed -e '/IGNORE THIS/s|\.[a-z][a-z0-9].*$||'`\|\' \
@@ -268,18 +275,18 @@
       sed -e '/IGNORE THIS/s|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
    utils/version.h
 
-# move man entry to 6x.
+# Move man entry to 6x (bug 197741)
 for f in `find hacks -name Makefile.in` ; do
    sed -i.mansuf \
       -e '/^mansuffix/s|6|6x|'\
       $f
 done
 
-# search first 6x entry, next 1 entry for man pages
+# Search first 6x entry, next 1 entry for man pages
 sed -i.manentry -e 's at man %%s at man 6x %%s 2>/dev/null || man 1 %%s @' \
    driver/XScreenSaver.ad.in
 
-# suppress rpmlint booing.
+# Suppress rpmlint warnings.
 # suppress about pam config (although this is 
 # not the fault of xscreensaver.pam ......).
 sed -i.rpmlint -n -e '1,5p' driver/xscreensaver.pam 
@@ -289,11 +296,16 @@
    cp -p %{_datadir}/libtool/config.{sub,guess} .
 fi
 
-# fix for desktop-file-utils 0.14+
+# Fix for desktop-file-utils 0.14+
 %if 0%{?fedora} >= 9
 sed -i.icon -e 's|xscreensaver\.xpm|xscreensaver|' \
    driver/screensaver-properties.desktop.in
 %endif
+# Kill OnlyShowIn=GNOME; on F-11+ (bug 483495)
+%if 0%{?fedora} >= 11
+sed -i.xfce -e '/OnlyShowIn/d' \
+   driver/screensaver-properties.desktop.in
+%endif
 
 # Disable (don't build) some tests
 # apm: doesn't compile
@@ -343,12 +355,12 @@
 	GMSGFMT="msgfmt --statistics"
 
 %if %{modular_conf}
-# Make XScreenSavar.ad modular
+# Make XScreenSavar.ad modular (bug 200881)
 CONFD=xscreensaver
 rm -rf $CONFD
 mkdir $CONFD
 
-# preserve the original adfile
+# Preserve the original adfile
 cp -p driver/XScreenSaver.ad $CONFD
 
 # First split XScreenSaver.ad into 3 parts
@@ -436,12 +448,12 @@
 %endif
 
 %if %{modular_conf}
-# install update script
+# Install update script
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
 echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
 
-# make hack conf modular
+# Make hack conf modular
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
 cp -p xscreensaver/XScreenSaver.ad* \
@@ -459,7 +471,7 @@
 echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
    >> $dd/base.files
 
-# check symlink
+# Check symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
 
 pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
@@ -476,14 +488,14 @@
 
 %endif
 
-# add documents
+# Add documents
 pushd $dd &> /dev/null
 for f in README* ; do
    echo "%%doc $f" >> $dd/base.files
 done
 popd
 
-# add directory
+# Add directory
 pushd $RPM_BUILD_ROOT
 for dir in `find . -type d | grep xscreensaver` ; do
    echo "%%dir ${dir#.}" >> $dd/base.files
@@ -493,7 +505,7 @@
 %find_lang %{name}
 cat %{name}.lang | uniq >> $dd/base.files
 
-# suppress rpmlint booing
+# Suppress rpmlint warnings
 # sanitize path in script file
 for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \
    ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \
@@ -514,7 +526,8 @@
 cd ..
 %endif
 
-# create desktop entry for gnome-screensaver
+# Create desktop entry for gnome-screensaver
+# bug 204944, 208560
 create_desktop(){
    COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
    NAME=`cat $1 | sed -n -e 's|^<screen.*_label=\"\(.*\)\">.*$|\1|p'`
@@ -633,6 +646,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Feb  2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-6
+- Remove OnlyShowIn=GNOME on F-11+ (to make happy with XFCE):
+  bug 483495
+- Add more comments about bug reference
+
 * Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-5
 - Fix phosphor segv when changing window size (bug 481146)