rpms/xscreensaver/devel xscreensaver.spec,1.13,1.14
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Fri Jun 23 08:56:36 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12133
Modified Files:
xscreensaver.spec
Log Message:
* Fri Jun 23 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-8
- Spec file script change.
- Add libtool to BuildRequires.
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xscreensaver.spec 16 Jun 2006 06:40:57 -0000 1.13
+++ xscreensaver.spec 23 Jun 2006 08:56:36 -0000 1.14
@@ -1,7 +1,7 @@
%define name xscreensaver
%define version 5.00
-%define fedora_rel 7.1
+%define fedora_rel 8
%define fedora_ver 5.90
%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
@@ -36,6 +36,7 @@
BuildRequires: desktop-file-utils
BuildRequires: autoconf >= 2.53
BuildRequires: sed
+BuildRequires: libtool
BuildRequires: bc
BuildRequires: pam-devel > %{pam_ver}
BuildRequires: xorg-x11-proto-devel
@@ -100,34 +101,38 @@
%patch104 -p1 -b .xmlfix
%patch105 -p1 -b .text-locale
-install -m644 -p %{SOURCE10} po/ja.po
+install -c -m644 -p %{SOURCE10} po/ja.po
change_option(){
ADFILE=$1
+ if [ ! -f ${ADFILE}.opts ] ; then
+ cp -p $ADFILE ${ADFILE}.opts
+ fi
shift
- while [ $# -ge 1 ] ; do
- ARG=$1
- TYPE=`echo $ARG | sed -e 's|=.*$||'`
- VALUE=`echo $ARG | sed -e 's|^.*=||'`
-
- eval sed -i -e \'s\|\^\\\*$TYPE\:\[ \\t\]\.\*\$\|\*${TYPE}:\\t$VALUE\|\' \
- $ADFILE
-
- shift
+ for ARG in "$@" ; do
+ TYPE=`echo $ARG | sed -e 's|=.*$||'`
+ VALUE=`echo $ARG | sed -e 's|^.*=||'`
+
+ eval sed -i \
+ -e \'s\|\^\\\(\\\*$TYPE\:\[ \\t\]\[ \\t\]\*\\\)\[\^ \\t\]\.\*\$\|\\1$VALUE\|\' \
+ $ADFILE
done
}
silence_hack(){
- ADFILE=$1
- shift
+ ADFILE=$1
+ if [ ! -f ${ADFILE}.hack ] ; then
+ cp -p $ADFILE ${ADFILE}.hack
+ fi
+ shift
- for hack in $* ; do
- eval sed -i \
- -e \'\/\^\[ \\t\]\[ \\t\]\*$hack\/s\|\^\|-\|g\' \
- -e \'s\|\^@GL_\.\*@.*\\\(GL\:\[ \\t\]\[ \\t\]\*$hack\\\)\|-\\t\\1\|g\' \
- $ADFILE
- done
+ for hack in "$@" ; do
+ eval sed -i \
+ -e \'\/\^\[ \\t\]\[ \\t\]\*$hack\/s\|\^\|-\|g\' \
+ -e \'s\|\^@GL_\.\*@.*\\\(GL\:\[ \\t\]\[ \\t\]\*$hack\\\)\|-\\t\\1\|g\' \
+ $ADFILE
+ done
}
change_option driver/XScreenSaver.ad.in \
@@ -138,43 +143,40 @@
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
-sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \
- driver/XScreenSaver.ad.in
+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].*$||'`\|\' \
+ driver/XScreenSaver.ad.in
+
+eval sed -i.date \
+ -e \'s\|\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\|`LANG=C date -u +'%%d-%%b-%%Y'`\|g\' \
+ driver/XScreenSaver.ad.in
+
+eval sed -i.ver \
+ -e \'s\|\(\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\)\|\(`LANG=C \
+ date -u +'%%d-%%b-%%Y'`\)\|g\' \
+ -e \'s\|\\\(5.\[0-9\]\[0-9\]\\\)[a-z]\[0-9\]\[0-9\]\*\|\\\1\|\' \
+ -e \'s\|5.\[0-9\]\[0-9\]\|%{version}-`echo %{release} | \
+ sed -e 's|\.[a-zA-Z][a-zA-Z0-9].*$||'`\|\' \
+ utils/version.h
-eval sed \
- -i -e \'s\|\[0-9\].\*-.\*-20\[0-9\]\[0-9\]\|`LANG=C date -u +'%%d-%%b-%%Y'`\|g\' \
- driver/XScreenSaver.ad.in
-
-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\' \
- utils/version.h
-
-if [ -x %{_datadir}/libtool/config.guess ]; then
- # use system-wide copy
- cp -p %{_datadir}/libtool/config.{sub,guess} .
-fi
-
-%build
#################################
# suppress rpmlint booing.
# suppress about pam config (although this is
# not the fault of xscreensaver.pam ......).
-mv driver/xscreensaver.pam driver/xscreensaver.pam.rpmlint
-head -n 5 driver/xscreensaver.pam.rpmlint > driver/xscreensaver.pam
-chmod 644 driver/xscreensaver.pam
+sed -i.rpmlint -n -e '1,5p' driver/xscreensaver.pam
#################################
+if [ -x %{_datadir}/libtool/config.guess ]; then
+ # use system-wide copy
+ cp -p %{_datadir}/libtool/config.{sub,guess} .
+fi
+
+%build
autoconf
archdir=`./config.guess`
mkdir $archdir
@@ -204,7 +206,7 @@
rm -rf ${RPM_BUILD_ROOT}
-make install_prefix=$RPM_BUILD_ROOT INSTALL="install -p" install
+make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -281,6 +283,10 @@
%defattr(-,root,root)
%changelog
+* Fri Jun 23 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-8
+- Spec file script change.
+- Add libtool to BuildRequires.
+
* 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
@@ -450,7 +456,7 @@
- add patch to fix vroot bug and make xscreensaver working in KDE again.
- get rid of webcollage, which often download porn images
-* Wed Nov 10 2004 Ray Strode <rstrode at redhat.com: 1:4.18-11
+* Wed Nov 10 2004 Ray Strode <rstrode at redhat.com> 1:4.18-11
- Add xscreensaver-register-hack program to make
installing and uninstalling screensavers easier
(working toward fixing bug 121693 [split up screensaver])
More information about the fedora-extras-commits
mailing list