rpms/xscreensaver/devel xscreensaver-4.22-use-hackdirname.patch, NONE, 1.1 xscreensaver-4.22-use-manname.patch, NONE, 1.1 xscreensaver-4.22-write-explicit-dirname.patch, NONE, 1.1 xscreensaver.spec, 1.71, 1.72 xscreensaver-4.22-allow-zero-dpms-timeout.patch, 1.1, NONE xscreensaver-4.22-dont-use-invalid-iters.patch, 1.1, NONE xscreensaver-4.22-ignore-unprintable-characters.patch, 1.1, NONE xscreensaver-4.22-make-hack-paths-absolute.patch, 1.2, NONE xscreensaver-4.22-realpath-heap-allocate.patch, 1.1, NONE xscreensaver-4.22-remove-density-option.patch, 1.1, NONE xscreensaver-4.22-signal-handler-fun.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 23 02:51:49 UTC 2006
Author: rstrode
Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11553
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-4.22-use-hackdirname.patch
xscreensaver-4.22-use-manname.patch
xscreensaver-4.22-write-explicit-dirname.patch
Removed Files:
xscreensaver-4.22-allow-zero-dpms-timeout.patch
xscreensaver-4.22-dont-use-invalid-iters.patch
xscreensaver-4.22-ignore-unprintable-characters.patch
xscreensaver-4.22-make-hack-paths-absolute.patch
xscreensaver-4.22-realpath-heap-allocate.patch
xscreensaver-4.22-remove-density-option.patch
xscreensaver-4.22-signal-handler-fun.patch
Log Message:
- update to 4.23
- add a BuildRequires on imake (spotted by Mamoru Tasaka)
- add a lot of patches and fixes from Mamoru Tasaka
xscreensaver-4.22-use-hackdirname.patch:
configure.in | 6 ++++++
1 files changed, 6 insertions(+)
--- NEW FILE xscreensaver-4.22-use-hackdirname.patch ---
--- xscreensaver-4.22/configure.in.usehackdir 2005-06-05 04:50:54.000000000 +0900
+++ xscreensaver-4.22/configure.in 2005-09-17 17:20:56.000000000 +0900
@@ -1257,6 +1257,11 @@
# canonicalize slashes.
HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'`
+# Expand HACKDIR as HACKDIR_FULL
+eval HACKDIR_FULL=${HACKDIR}
+eval HACKDIR_FULL=${HACKDIR_FULL}
+eval HACKDIR_FULL=${HACKDIR_FULL}
+
# This option used to be called --enable-subdir; make sure that is no longer
# used, since configure brain-damagedly ignores unknown --enable options.
@@ -3607,6 +3612,7 @@
AC_SUBST(GNOME22)
AC_SUBST(NOGNOME)
AC_SUBST(HACKDIR)
+AC_SUBST(HACKDIR_FULL)
AC_SUBST(GTK_DATADIR)
AC_SUBST(PO_DATADIR)
AC_SUBST(HACK_CONF_DIR)
xscreensaver-4.22-use-manname.patch:
driver/Makefile.in | 2 ++
hacks/Makefile.in | 2 ++
hacks/glx/Makefile.in | 2 ++
3 files changed, 6 insertions(+)
--- NEW FILE xscreensaver-4.22-use-manname.patch ---
--- xscreensaver-4.22/driver/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900
+++ xscreensaver-4.22/driver/Makefile.in 2005-09-07 16:59:19.000000000 +0900
@@ -377,6 +377,8 @@
\
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
+ manbase=`echo $$man | sed 's/\.man$$//'` ; \
+ TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \
sed -e "s/^\.TH.*/$$TH/" \
-e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \
< $(srcdir)/$$man > $$T ; \
--- xscreensaver-4.22/hacks/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900
+++ xscreensaver-4.22/hacks/Makefile.in 2005-09-07 17:01:19.000000000 +0900
@@ -322,6 +322,8 @@
\
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
+ manbase=`echo $$man | sed 's/\.man$$//'` ; \
+ TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \
sed -e "s/^\.TH.*/$$TH/" \
-e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \
< $(srcdir)/$$man > $$T ; \
--- xscreensaver-4.22/hacks/glx/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900
+++ xscreensaver-4.22/hacks/glx/Makefile.in 2005-09-07 17:01:42.000000000 +0900
@@ -246,6 +246,8 @@
\
for man in $$men; do \
instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \
+ manbase=`echo $$man | sed 's/\.man$$//'` ; \
+ TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \
sed -e "s/^\.TH.*/$$TH/" \
-e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \
< $(srcdir)/$$man > $$T ; \
xscreensaver-4.22-write-explicit-dirname.patch:
driver/Makefile.in | 33 +++++++++++++++++++++++++++++++++
hacks/Makefile.in | 3 +++
hacks/glx/Makefile.in | 4 ++++
3 files changed, 40 insertions(+)
--- NEW FILE xscreensaver-4.22-write-explicit-dirname.patch ---
--- xscreensaver-4.22/driver/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900
+++ xscreensaver-4.22/driver/Makefile.in 2005-09-15 16:55:40.000000000 +0900
@@ -26,6 +26,7 @@
GTK_DATADIR = @GTK_DATADIR@
GTK_APPDIR = $(GTK_DATADIR)/applications
GTK_ICONDIR = $(GTK_DATADIR)/pixmaps
+SAVER_DATADIR = $(GTK_DATADIR)/xscreensaver
GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade
HACK_CONF_DIR = @HACK_CONF_DIR@
@@ -286,6 +287,7 @@
$$e "" ;\
fi ; \
fi ; \
+ echo "Installing driver programs in the directory $(install_prefix)$(bindir)" ;\
echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \
$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
@for exe in xscreensaver-command xscreensaver-demo \
@@ -298,6 +300,7 @@
@if [ ! -d $(install_prefix)$(AD_DIR) ]; then \
$(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \
fi
+ @echo "Installing XScreenSaver.ad in the directory $(install_prefix)$(AD_DIR)"
@-echo $(INSTALL_DATA) XScreenSaver.ad \
$(install_prefix)$(AD_DIR)/XScreenSaver ; \
if $(INSTALL_DATA) XScreenSaver.ad \
@@ -371,6 +374,7 @@
TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \
echo "installing man pages: $$TH" ; \
\
+ echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \
if [ ! -d $(install_prefix)$(manNdir) ]; then \
$(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \
fi ; \
@@ -413,7 +417,15 @@
dir="$(install_prefix)$(PAM_DIR)" ; \
conf="$(PAM_CONF)" ; \
\
+ \
+ if [ ! -d $$dir -a ! -f $$conf ] ; then \
+ echo $(INSTALL_DIRS) $$dir ; \
+ $(INSTALL_DIRS) $$dir ; \
+ fi ; \
+ \
+ \
if [ -d $$dir ] ; then \
+ echo "Installing pam script file in the directory $(install_prefix)$(PAM_DIR)" ;\
\
if [ -f $$dir/xdm ]; then \
src2=$$dir/xdm ; \
@@ -486,6 +498,7 @@
# into /usr/share/applications/
install-gnome:: screensaver-properties.desktop
@if [ "$(GTK_DATADIR)" != "" ]; then \
+ echo "Installing desktop text in the directory $(install_prefix)$(GTK_APPDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\
@@ -502,6 +515,7 @@
# into /usr/share/pixmaps/
install-gnome:: $(LOGO)
@if [ "$(GTK_DATADIR)" != "" ]; then \
+ echo "Installing X pixmap image file in the directory $(install_prefix)$(GTK_ICONDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\
@@ -517,6 +531,15 @@
# into /usr/share/xscreensaver/glade/
install-gnome::
@if [ "$(GTK_GLADEDIR)" != "" ]; then \
+ \
+ \
+ echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\
+ if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \
+ echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\
+ $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\
+ fi ; \
+ \
+ echo "Installing PNG image file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
@@ -534,6 +557,15 @@
# into /usr/share/xscreensaver/glade/
install-gnome:: xscreensaver-demo.glade2
@if [ "$(GTK_GLADEDIR)" != "" ]; then \
+ \
+ \
+ echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\
+ if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \
+ echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\
+ $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\
+ fi ; \
+ \
+ echo "Installing XML glade2 file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\
if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \
echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
$(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\
@@ -600,6 +632,7 @@
# /usr/share/xscreensaver/config/README
install-xml:
@dest=$(install_prefix)$(HACK_CONF_DIR) ; \
+ echo "Installing README text in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\
if [ ! -d $$dest ]; then \
$(INSTALL_DIRS) $$dest ; \
fi ; \
--- xscreensaver-4.22/hacks/glx/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900
+++ xscreensaver-4.22/hacks/glx/Makefile.in 2005-09-15 17:00:08.000000000 +0900
@@ -201,6 +201,7 @@
install-program:: $(EXES)
@exes="$(HACK_EXES)" ; \
idir="$(install_prefix)$(HACKDIR)" ; \
+ echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\
if [ "$$exes" != "" ]; then \
if [ ! -d $$idir ]; then \
$(INSTALL_DIRS) $$idir ; \
@@ -214,6 +215,7 @@
# the xscreensaver-gl-helper program, in $bindir
install-program:: $(EXES)
@exes="@GL_UTIL_EXES@" ; \
+ echo "Installing gl-helper program in the directory $(install_prefix)$(bindir)" ;\
idir="$(install_prefix)$(bindir)" ; \
if [ "$$exes" != "" ]; then \
if [ ! -d $$idir ]; then \
@@ -240,6 +242,7 @@
TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \
echo "installing man pages: $$TH" ; \
\
+ echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \
if [ ! -d $(install_prefix)$(manNdir) ]; then \
$(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \
fi ; \
@@ -260,6 +263,7 @@
install-xml:
@dest=$(install_prefix)$(HACK_CONF_DIR) ; \
+ echo "Installing XML config files in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\
if [ ! -d $$dest ]; then \
$(INSTALL_DIRS) $$dest ; \
fi ; \
--- xscreensaver-4.22/hacks/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900
+++ xscreensaver-4.22/hacks/Makefile.in 2005-09-15 16:56:03.000000000 +0900
@@ -243,6 +243,7 @@
@if [ ! -d $(install_prefix)$(HACKDIR) ]; then \
$(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \
fi ; \
+ echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\
for program in $(NEXES); do \
echo $(INSTALL_PROGRAM) $$program \
$(install_prefix)$(HACKDIR)/$$program ; \
@@ -316,6 +317,7 @@
TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \
echo "installing man pages: $$TH" ; \
\
+ echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ;\
if [ ! -d $(install_prefix)$(manNdir) ]; then \
$(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \
fi ; \
@@ -336,6 +338,7 @@
install-xml:
@dest=$(install_prefix)$(HACK_CONF_DIR) ; \
+ echo "Installing XML config documents in the directory $(HACK_CONF_DIR)" ;\
if [ ! -d $$dest ]; then \
$(INSTALL_DIRS) $$dest ; \
fi ; \
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xscreensaver.spec 17 Dec 2005 20:52:03 -0000 1.71
+++ xscreensaver.spec 23 Jan 2006 02:51:46 -0000 1.72
@@ -1,10 +1,12 @@
%define name xscreensaver
-%define version 4.22
+%define version 4.23
+
+%define default_text %{_datadir}/doc/fedora-release-4/RELEASE-NOTES
Summary: X screen saver and locker
Name: %{name}
Version: %{version}
-Release: 21.2
+Release: 1
Epoch: 1
License: BSD
Group: Amusements/Graphics
@@ -13,26 +15,36 @@
Source1: removed-display-modes
Patch0: xscreensaver-4.22-change-defaults.patch
Patch1: xscreensaver-4.16-sanitize-hacks.patch
-Patch2: xscreensaver-4.21-dont-ping-if-not-root.patch
-Patch3: xscreensaver-4.22-make-hack-paths-absolute.patch
-Patch4: xscreensaver-4.21-use-hack-basename.patch
-Patch5: xscreensaver-4.22-signal-handler-fun.patch
-Patch6: xscreensaver-4.22-dont-use-invalid-iters.patch
-Patch7: xscreensaver-4.22-realpath-heap-allocate.patch
-Patch8: xscreensaver-4.22-ignore-unprintable-characters.patch
-Patch9: xscreensaver-4.22-remove-density-option.patch
-Patch10: xscreensaver-4.22-fix-man-pages.patch
-Patch11: xscreensaver-4.22-dont-allow-root.patch
-Patch12: xscreensaver-4.22-allow-zero-dpms-timeout.patch
-Patch13: xscreensaver-4.22-pam-include.patch
+Patch2: xscreensaver-4.21-dont-ping-if-not-root.patch
+Patch3: xscreensaver-4.21-use-hack-basename.patch
+Patch4: xscreensaver-4.22-fix-man-pages.patch
+Patch5: xscreensaver-4.22-dont-allow-root.patch
+Patch6: xscreensaver-4.22-pam-include.patch
+Patch7: xscreensaver-4.22-use-manname.patch
+Patch8: xscreensaver-4.22-write-explicit-dirname.patch
+Patch9: xscreensaver-4.22-use-hackdirname.patch
+Patch10: xscreensaver-4.22-show-uname.patch
+Patch11: xscreensaver-4.22-make-hackdir-absolute-path-new.patch
+Patch12: xscreensaver-4.23-manfile-entry-fix.patch
+Patch13: xscreensaver-4.22-mandir-fix-against10.patch
+Patch14: xscreensaver-4.23-fix-inconsistency.patch
+Patch15: xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch
+Patch16: xscreensaver-4.23-realpath-heap-allocate.patch
+Patch17: xscreensaver-4.23-default-text.patch
+Patch18: xscreensaver-4.23-modularX-addoption.patch
+Patch19: xscreensaver-4.23-remove-gccwarn-pointer.patch
+Patch20: xscreensaver-4.23-fix-free-demoGtk.patch
+
Buildroot: %{_tmppath}/%{name}-root
# find_lang
BuildRequires: gettext
BuildRequires: desktop-file-utils
+BuildRequires: imake
# /sbin/pidof
Requires: SysVinit
+Requires: fedora-release
%package base
Summary: A minimal installation of xscreensaver.
@@ -58,7 +70,7 @@
%description
A modular screen saver and locker for the X Window System.
-More than 190 display modes are included in this package.
+More than 200 display modes are included in this package.
%description base
A modular screen saver and locker for the X Window System.
@@ -83,17 +95,25 @@
%patch0 -p1 -b .change-defaults
%patch1 -p1 -b .sanitize-hacks
%patch2 -p1 -b .dont-ping-if-not-root
-%patch3 -p1 -b .make-hack-paths-absolute
-%patch4 -p1 -b .use-hack-basename
-%patch5 -p1 -b .signal-handler-fun
-%patch6 -p1 -b .dont-use-invalid-iters
-%patch7 -p1 -b .realpath-heap-allocate
-%patch8 -p1 -b .ignore-unprintable-characters
-%patch9 -p1 -b .rmeove-density-option
-%patch10 -p1 -b .fix-man-pages
-%patch11 -p1 -b .dont-allow-root
-%patch12 -p1 -b .allow-zero-dpms-timeout
-%patch13 -p1 -b .pam-include
+%patch3 -p1 -b .use-hack-basename
+%patch4 -p1 -b .fix-man-pages
+%patch5 -p1 -b .dont-allow-root
+%patch6 -p1 -b .pam-include
+%patch7 -p1 -b .use-manname
+%patch8 -p1 -b .write-explicit-dirname
+%patch9 -p1 -b .use-hackdirname
+%patch10 -p1 -b .show-uname
+%patch11 -p1 -b .make-hackdir-absolute-path-new
+%patch12 -p1 -b .manfile-entry-fix
+%patch13 -p1 -b .mandir-fix-against10
+%patch14 -p1 -b .fix-inconsistency
+%patch15 -p1 -b .allow-zero-dpms-timeout-MOREFIX
+%patch16 -p1 -b .realpath-heap-allocate
+%patch17 -p1 -b .default-text
+%patch18 -p1 -b .modularX-addoption
+%patch19 -p1 -b .remove-gccwarn-pointer
+%patch20 -p1 -b .fix-free-demoGtk
+
if [ -x %{_datadir}/libtool/config.guess ]; then
# use system-wide copy
@@ -101,6 +121,7 @@
fi
%build
+autoconf
archdir=`./config.guess`
mkdir $archdir
cd $archdir
@@ -110,6 +131,9 @@
CONFIG_OPTS="--with-pam --without-shadow --without-kerberos"
CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
CONFIG_OPTS="$CONFIG_OPTS --with-fortune=%{fortune}"
+CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
+CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
+
# This is flaky:
# CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -129,15 +153,15 @@
# We have to make sure these directories exist,
# or nothing will be installed into them.
#
-mkdir -p $RPM_BUILD_ROOT%{_bindir} \
- $RPM_BUILD_ROOT%{_datadir}/xscreensaver \
- $RPM_BUILD_ROOT%{_libexecdir}/xscreensaver \
- $RPM_BUILD_ROOT%{_mandir}/man1/xscreensaver \
- $RPM_BUILD_ROOT/etc/pam.d
+#mkdir -p $RPM_BUILD_ROOT%{_bindir} \
+# $RPM_BUILD_ROOT%{_datadir}/xscreensaver \
+# $RPM_BUILD_ROOT%{_libexecdir}/xscreensaver \
+# $RPM_BUILD_ROOT%{_mandir}/man1/xscreensaver \
+# $RPM_BUILD_ROOT/etc/pam.d
make install_prefix=$RPM_BUILD_ROOT install
-mv $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man6
+#mv $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man6
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -229,6 +253,11 @@
%defattr(-,root,root)
%changelog
+* Fri Jan 13 2006 Ray Strode <rstrode at redhat.com> 1:4.23-1
+- update to 4.23
+- add a BuildRequires on imake (spotted by Mamoru Tasaka)
+- add a lot of patches and fixes from Mamoru Tasaka
+
* Sat Dec 17 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
--- xscreensaver-4.22-allow-zero-dpms-timeout.patch DELETED ---
--- xscreensaver-4.22-dont-use-invalid-iters.patch DELETED ---
--- xscreensaver-4.22-ignore-unprintable-characters.patch DELETED ---
--- xscreensaver-4.22-make-hack-paths-absolute.patch DELETED ---
--- xscreensaver-4.22-realpath-heap-allocate.patch DELETED ---
--- xscreensaver-4.22-remove-density-option.patch DELETED ---
--- xscreensaver-4.22-signal-handler-fun.patch DELETED ---
More information about the fedora-cvs-commits
mailing list