rpms/xscreensaver/devel xscreensaver.spec,1.11,1.12

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Thu Jun 15 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-7
- Change timestamps.
- Forcely replace the default text till the release version of fedora-release
  formally changes.



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xscreensaver.spec	10 Jun 2006 07:26:41 -0000	1.11
+++ xscreensaver.spec	16 Jun 2006 06:24:49 -0000	1.12
@@ -1,11 +1,13 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	6.1
+%define fedora_rel	7
 
-%define fedora_ver	5.89
+%define fedora_ver	5.90
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
 
+%define pam_ver		0.80-7
+
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:	X screen saver and locker
@@ -35,7 +37,7 @@
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	sed
 BuildRequires: 	bc
-BuildRequires: 	pam-devel > 0.80-7
+BuildRequires: 	pam-devel > %{pam_ver}
 BuildRequires: 	xorg-x11-proto-devel
 BuildRequires: 	libX11-devel, libXScrnSaver-devel, libXext-devel
 BuildRequires: 	libXinerama-devel
@@ -48,14 +50,13 @@
 BuildRequires: 	gtk2-devel libglade2-devel
 Requires:       fedora-release
 Requires: 	/etc/pam.d/system-auth, htmlview
+Requires:	pam > %{pam_ver}
 Provides: 	xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes: 	xscreensaver
 
 %package extras
 Summary: 	An enhanced set of screensavers
 Group: 		Amusements/Graphics
-# Switch desktop-backgrounds-basic from Requires to BuildRequires as
-# configure needs it but xscreensaver can get along with no images.
 BuildRequires:	desktop-backgrounds-basic
 
 %package gl-extras
@@ -99,7 +100,7 @@
 %patch104 -p1 -b .xmlfix
 %patch105 -p1 -b .text-locale
 
-install -m644 %{SOURCE10} po/ja.po
+install -m644 -p %{SOURCE10} po/ja.po
 
 change_option(){
    ADFILE=$1
@@ -130,10 +131,18 @@
 }
 
 change_option driver/XScreenSaver.ad.in \
-	grabDesktopImages=False lock=True \
-	splash=False ignoreUninstalledPrograms=True \
+	grabDesktopImages=False \
+	lock=True \
+	splash=False \
+	ignoreUninstalledPrograms=True \
+	textProgram=fortune\ -s \
 	passwd.heading.label=Screen\ Locked
 
+# Forcely replace the default text till the formal 
+# fedora-release-%{version} is released.
+change_option driver/XScreenSaver.ad.in \
+	textFile=%{default_text}
+
 silence_hack driver/XScreenSaver.ad.in \
 	bsod flag
 
@@ -144,13 +153,11 @@
    -i -e \'s\|\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\|`LANG=C date -u +'%%d-%%b-%%Y'`\|g\' \
    driver/XScreenSaver.ad.in
 
-cd utils
 eval sed \
    -i -e \'s\|\(\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\)\|\(`LANG=C date -u +'%%d-%%b-%%Y'`\)\|g\' \
    -i -e \'s\|\\\(5.\[0-9\]\[0-9\]\\\)[a-z]\[0-9\]\[0-9\]\*\|\\\1\|\' \
    -i -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | sed -e 's|\..*||g'`\|g\' \
-   version.h
-cd ..
+   utils/version.h
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -161,7 +168,7 @@
 #################################
 # suppress rpmlint booing.
 # suppress about pam config (although this is 
-# not the fault of xscreensaver.pam ......)
+# not the fault of xscreensaver.pam ......).
 
 mv driver/xscreensaver.pam driver/xscreensaver.pam.rpmlint
 head -n 5 driver/xscreensaver.pam.rpmlint > driver/xscreensaver.pam
@@ -197,7 +204,7 @@
 
 rm -rf ${RPM_BUILD_ROOT}
 
-make install_prefix=$RPM_BUILD_ROOT install
+make install_prefix=$RPM_BUILD_ROOT INSTALL="install -p" install
 
 desktop-file-install --vendor gnome --delete-original                         \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                               \
@@ -239,7 +246,7 @@
 
 #################################
 # suppress rpmlint booing.
-# remove directories explicitly included in filesystem rpm
+# remove directories explicitly included in filesystem rpm.
 for f in %{_bindir} %{_datadir}/applications \
    %{_mandir}/man[1-9]  %{_datadir}/pixmaps ; do
    ff=`echo $f | sed -e 's|\/|\\\\\\\\\/|g'`
@@ -248,12 +255,12 @@
    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|/usr//bin|/usr/bin|g' $f
    fi
 done
 
@@ -274,6 +281,11 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Jun 15 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-7
+- Change timestamps.
+- Forcely replace the default text till the release version of fedora-release
+  formally changes.
+
 * Sat Jun 10 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-6.1
 - Fix the requirement for rebuilding to meet the demand
   from current mock.