rpms/xscreensaver/devel xscreensaver.spec,1.31,1.32

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-2
- Finally move man pages to 6x (#205796)
- Fix the ownership of directories (#187892)



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xscreensaver.spec	19 Sep 2006 06:22:17 -0000	1.31
+++ xscreensaver.spec	26 Sep 2006 14:03:11 -0000	1.32
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    1
+%define fedora_rel    2
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -10,7 +10,7 @@
 %define autoconf_ver  2.53
 
 %define update_po     1
-%define allow_non_passwd 0
+%define allow_non_passwd    0
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -176,6 +176,7 @@
    set -x
 }
 
+# change some options
 change_option driver/XScreenSaver.ad.in \
    passwdTimeout=0:00:15 \
    grabDesktopImages=False \
@@ -185,9 +186,11 @@
    textProgram=fortune\ -s \
    passwd.heading.label=Screen\ Locked
 
+# silence the following hacks by default
 silence_hack driver/XScreenSaver.ad.in \
    bsod flag
 
+# record time, version
 eval sed -i.ver \
    -e \'s\|version \[45\]\.\[0-9a-z\]\[0-9a-z\]\*\|version %{version}-`echo \
       %{release} | sed -e 's|\.[a-z][a-z0-9].*$||'`\|\' \
@@ -208,18 +211,18 @@
 # move man entry to 6x.
 for f in `find hacks -name Makefile.in` ; do
    sed -i.mansuf \
-      -e '/^mansuffix/s|6|6x\nmandirsuf = 6|' \
-      -e '/^manNdir/s|mansuffix|mandirsuf|'\
+      -e '/^mansuffix/s|6|6x|'\
       $f
 done
 
-#################################
+# 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 about pam config (although this is 
 # not the fault of xscreensaver.pam ......).
-
 sed -i.rpmlint -n -e '1,5p' driver/xscreensaver.pam 
-#################################
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -234,7 +237,7 @@
 
 export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}"
 
-CONFIG_OPTS="--prefix=/usr --with-pam --without-shadow --without-kerberos"
+CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos"
 CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
 CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
 CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
@@ -294,7 +297,7 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
-# Add documents
+# add documents
 pushd $dd &> /dev/null
 for f in README* ; do
    echo "%%doc $f" >> $dd/base.files
@@ -304,27 +307,33 @@
 %find_lang %{name}
 cat %{name}.lang | uniq >> $dd/base.files
 
-#################################
-# suppress rpmlint booing.
-# remove directories explicitly included in filesystem rpm.
-for f in %{_bindir} %{_datadir}/applications \
-   %{_mandir}/man[1-9]  %{_datadir}/pixmaps ; do
+# suppress rpmlint booing
+# remove directories explicitly included in filesystem rpm
+for f in \
+   %{_sysconfdir}/pam.d \
+   %{_bindir} \
+   %{_datadir}/applications \
+   %{_datadir}/pixmaps \
+   %{_datadir}/X11/app-defaults \
+   %{_mandir}/man[1-9] \
+   ; do
+   :
    ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'`
    for g in $dd/*.files ; do
       eval sed -i -e \/$ff\$\/d $g
    done
 done
 
-# sanitize path in script file.
+# sanitize path in script file
 for f in ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-getimage-* \
    ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver/vidwhacker \
    ${RPM_BUILD_ROOT}%{_bindir}/xscreensaver-text ; do
    if [ -f $f ] ; then
-      sed -i -e 's|/usr//bin|/usr/bin|g' $f
+      sed -i -e 's|%{_prefix}//bin|%{_bindir}|g' $f
    fi
 done
 
-# Create desktop entry for gnome-screensaver
+# create desktop entry for gnome-screensaver
 create_desktop(){
    set +x
    COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
@@ -395,6 +404,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Sep 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-2
+- Finally move man pages to 6x (#205796)
+- Fix the ownership of directories (#187892)
+
 * Tue Sep 19 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-1
 - 5.01
 - Revert non-passwd auth patch and disable it for now (see bug #205669)