rpms/xscreensaver/devel xscreensaver.spec,1.27,1.28
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Sep 9 04:46:25 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9196
Modified Files:
xscreensaver.spec
Log Message:
* Sat Sep 9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-20
- Change default document.
- Again man entry fix.
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xscreensaver.spec 5 Sep 2006 15:51:27 -0000 1.27
+++ xscreensaver.spec 9 Sep 2006 04:46:25 -0000 1.28
@@ -1,90 +1,89 @@
-%define name xscreensaver
+%define name xscreensaver
-%define version 5.00
-%define fedora_rel 19
+%define version 5.00
+%define fedora_rel 20
-%define fedora_ver 5.91.1
-%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
+%define default_text %{_datadir}/eula/eula.en_US
-%define pam_ver 0.80-7
-%define autoconf_ver 2.53
-
-%define update_po 1
-
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Summary: X screen saver and locker
-Name: %{name}
-Version: %{version}
-Release: %{fedora_rel}%{?dist}%{?extrarel}
-Epoch: 1
-License: BSD
-Group: Amusements/Graphics
-URL: http://www.jwz.org/xscreensaver/
-Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
-Source10: xscreensaver-5.00-ja.po
-Patch0: xscreensaver-5.00-browser-setting.patch
-Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
-Patch5: xscreensaver-5.00-rootpasswd.patch
-Patch8: xscreensaver-5.00b5-include-directory.patch
-Patch101: xscreensaver-5.00-localefix-restrict.patch
-Patch102: xscreensaver-5.00-matherr-utils.patch
-Patch104: xscreensaver-5.00-xmlmanfix.patch
-Patch105: xscreensaver-5.00-text-locale.patch
-Patch110: xscreensaver-5.00-fix-hacks.patch
-Patch111: xscreensaver-5.00-kill-getimage.patch
-Patch112: xscreensaver-5.00-po-correctdir.patch
-#Patch113: xscreensaver-5.00-localesegv.patch
+%define pam_ver 0.80-7
+%define autoconf_ver 2.53
+
+%define update_po 1
+
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Summary: X screen saver and locker
+Name: %{name}
+Version: %{version}
+Release: %{fedora_rel}%{?dist}%{?extrarel}
+Epoch: 1
+License: BSD
+Group: Amusements/Graphics
+URL: http://www.jwz.org/xscreensaver/
+Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
+Source10: xscreensaver-5.00-ja.po
+Patch0: xscreensaver-5.00-browser-setting.patch
+Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
+Patch5: xscreensaver-5.00-rootpasswd.patch
+Patch8: xscreensaver-5.00b5-include-directory.patch
+Patch101: xscreensaver-5.00-localefix-restrict.patch
+Patch102: xscreensaver-5.00-matherr-utils.patch
+Patch104: xscreensaver-5.00-xmlmanfix.patch
+Patch105: xscreensaver-5.00-text-locale.patch
+Patch110: xscreensaver-5.00-fix-hacks.patch
+Patch111: xscreensaver-5.00-kill-getimage.patch
+Patch112: xscreensaver-5.00-po-correctdir.patch
+#Patch113: xscreensaver-5.00-localesegv.patch
%package base
-Summary: A minimal installation of xscreensaver
-Group: Amusements/Graphics
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
-BuildRequires: autoconf >= %{autoconf_ver}
-BuildRequires: sed
-BuildRequires: libtool
-BuildRequires: bc
-BuildRequires: pam-devel > %{pam_ver}
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
-BuildRequires: libXinerama-devel
-BuildRequires: libXmu-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXt-devel
-BuildRequires: libXxf86misc-devel
-BuildRequires: libXxf86vm-devel
-BuildRequires: libjpeg-devel
-BuildRequires: gtk2-devel libglade2-devel
-BuildRequires: fedora-release
-Requires: /etc/pam.d/system-auth
-Requires: pam > %{pam_ver}
-Provides: xscreensaver = %{epoch}:%{version}-%{release}
-Obsoletes: xscreensaver
+Summary: A minimal installation of xscreensaver
+Group: Amusements/Graphics
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: autoconf >= %{autoconf_ver}
+BuildRequires: sed
+BuildRequires: libtool
+BuildRequires: bc
+BuildRequires: pam-devel > %{pam_ver}
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+BuildRequires: libXt-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libjpeg-devel
+BuildRequires: gtk2-devel libglade2-devel
+BuildRequires: fedora-release
+Requires: /etc/pam.d/system-auth
+Requires: pam > %{pam_ver}
+Provides: xscreensaver = %{epoch}:%{version}-%{release}
+Obsoletes: xscreensaver
%package extras
-Summary: An enhanced set of screensavers
-Group: Amusements/Graphics
-BuildRequires: desktop-backgrounds-basic
+Summary: An enhanced set of screensavers
+Group: Amusements/Graphics
+BuildRequires: desktop-backgrounds-basic
%package gl-extras
-Summary: An enhanced set of screensavers that require OpenGL
-Group: Amusements/Graphics
-Provides: xscreensaver-gl = %{epoch}:%{version}-%{release}
-Obsoletes: xscreensaver-gl
-BuildRequires: libGLU-devel, libGL-devel
+Summary: An enhanced set of screensavers that require OpenGL
+Group: Amusements/Graphics
+Provides: xscreensaver-gl = %{epoch}:%{version}-%{release}
+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
+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
+Summary: Desktop files of gl-extras for gnome-screensaver
+Group: Amusements/Graphics
+Requires: %{name}-gl-extras = %{epoch}:%{version}-%{release}
+Requires: gnome-screensaver
%description
@@ -150,7 +149,7 @@
eval sed -i \
-e \'s\|\^\\\(\\\*$TYPE\:\[ \\t\]\[ \\t\]\*\\\)\[\^ \\t\]\.\*\$\|\\1$VALUE\|\' \
- $ADFILE
+ $ADFILE
done
}
@@ -163,44 +162,47 @@
for hack in "$@" ; do
eval sed -i \
- -e \'\/\^\[ \\t\]\[ \\t\]\*$hack\/s\|\^\|-\|g\' \
- -e \'s\|\^@GL_\.\*@.*\\\(GL\:\[ \\t\]\[ \\t\]\*$hack\\\)\|-\\t\\1\|g\' \
- $ADFILE
+ -e \'\/\^\[ \\t\]\[ \\t\]\*$hack\/s\|\^\|-\|g\' \
+ -e \'s\|\^@GL_\.\*@.*\\\(GL\:\[ \\t\]\[ \\t\]\*$hack\\\)\|-\\t\\1\|g\' \
+ $ADFILE
done
}
change_option driver/XScreenSaver.ad.in \
- passwdTimeout=0:00:15 \
- grabDesktopImages=False \
- lock=True \
- splash=False \
- ignoreUninstalledPrograms=True \
- textProgram=fortune\ -s \
- passwd.heading.label=Screen\ Locked
+ passwdTimeout=0:00:15 \
+ grabDesktopImages=False \
+ lock=True \
+ splash=False \
+ ignoreUninstalledPrograms=True \
+ textProgram=fortune\ -s \
+ passwd.heading.label=Screen\ Locked
silence_hack driver/XScreenSaver.ad.in \
- bsod flag
+ bsod flag
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
+ -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
+ -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
+ -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
# move man entry to 6x.
for f in `find hacks -name Makefile.in` ; do
- sed -i -e '/^mansuffix/s|6|6x|' $f
+ sed -i.mansuf \
+ -e '/^mansuffix/s|6|6x\nmandirsuf = 6|' \
+ -e '/^manNdir/s|mansuffix|mandirsuf|'\
+ $f
done
#################################
@@ -213,7 +215,7 @@
if [ -x %{_datadir}/libtool/config.guess ]; then
# use system-wide copy
- cp -p %{_datadir}/libtool/config.{sub,guess} .
+ cp -p %{_datadir}/libtool/config.{sub,guess} .
fi
%build
@@ -252,26 +254,26 @@
make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
-desktop-file-install --vendor gnome --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-only-show-in GNOME \
- --add-category X-Red-Hat-Base \
+desktop-file-install --vendor gnome --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-only-show-in GNOME \
+ --add-category X-Red-Hat-Base \
$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
# 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' \
- | sed -e "s@${RPM_BUILD_ROOT}@@" \
- -e "s@/[a-z][a-z]*/\.\./@/@" \
- | sed -e '/%%dir/!s@\(.*/man/.*\)@\1\*@' \
- -e '/%%dir/!s@\(.*/pam\.d/\)@%%config(noreplace) \1@' \
- -e 's|/%%dir\([^ ][^ ]*\)$|%%dir \1|' \
- | sort \
- | uniq
+ 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' \
+ | sed -e "s@${RPM_BUILD_ROOT}@@" \
+ -e "s@/[a-z][a-z]*/\.\./@/@" \
+ | sed -e '/%%dir/!s@\(.*/man/.*\)@\1\*@' \
+ -e '/%%dir/!s@\(.*/pam\.d/\)@%%config(noreplace) \1@' \
+ -e 's|/%%dir\([^ ][^ ]*\)$|%%dir \1|' \
+ | sort \
+ | uniq
}
# Generate three lists of files for the three packages.
@@ -382,6 +384,10 @@
%defattr(-,root,root)
%changelog
+* Sat Sep 9 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-20
+- Change default document.
+- Again man entry fix.
+
* 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)
@@ -614,7 +620,7 @@
(bug 64518)
* Tue Nov 9 2004 Ray Strode <rstrode at redhat.com> 1:4.18-7
-- Get rid of old crufty %{_datadir}/control-center/ tree
+- Get rid of old crufty %%{_datadir}/control-center/ tree
(bug 114692)
* Wed Nov 3 2004 Ray Strode <rstrode at redhat.com> 1:4.18-6
@@ -709,7 +715,7 @@
* Fri Nov 8 2002 Nalin Dahyabhai <nalin at redhat.com> 4.06-1
- add a BuildPrereq on bc, which configure requires
- replace use of fortune with an innocuous-and-editable stand-in script in
- %{stand_in_path}
+ %%{stand_in_path}
- define FORTUNE_PROGRAM at compile-time to force apps to use what's specified
even if it doesn't happen to be installed at compile-time
More information about the scm-commits
mailing list