rpms/xscreensaver/FC-6 xscreensaver-5.03-compiler-warning.patch, NONE, 1.1 xscreensaver-5.03-demo-conf-maxvalue-plus1.patch, NONE, 1.1 xscreensaver-5.03-screen-depth.patch, NONE, 1.1 xscreensaver.spec, 1.39, 1.40
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Thu Nov 1 14:17:05 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2578/FC-6
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.03-compiler-warning.patch
xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
xscreensaver-5.03-screen-depth.patch
Log Message:
Reupload the correct patch and apply patches also for FC-6
xscreensaver-5.03-compiler-warning.patch:
--- NEW FILE xscreensaver-5.03-compiler-warning.patch ---
--- xscreensaver-5.03/driver/xscreensaver.c.orig 2007-03-15 17:33:00.000000000 +0900
+++ xscreensaver-5.03/driver/xscreensaver.c 2007-10-15 14:16:02.000000000 +0900
@@ -1406,7 +1406,9 @@
if (!spasswd)
{
fprintf(stderr, "Could not figure out who the current user is!\n");
+#if 0
fprintf(stderr, "spasswd is %x\n", (unsigned int) spasswd);
+#endif
return 1;
}
xscreensaver-5.03-demo-conf-maxvalue-plus1.patch:
--- NEW FILE xscreensaver-5.03-demo-conf-maxvalue-plus1.patch ---
--- xscreensaver-5.03/driver/demo-Gtk-conf.c.debug 2006-05-24 07:02:11.000000000 +0900
+++ xscreensaver-5.03/driver/demo-Gtk-conf.c 2007-10-06 22:36:55.000000000 +0900
@@ -749,6 +749,7 @@
: p->value);
gfloat si = (p->high - p->low) / 100;
gfloat pi = (p->high - p->low) / 10;
+ gfloat page_size = ((p->type == SLIDER) ? 1 : 0);
if (p->value < p->low || p->value > p->high)
{
@@ -786,8 +787,8 @@
return GTK_ADJUSTMENT (gtk_adjustment_new (value,
p->low,
- p->high + 1,
- si, pi, 1));
+ p->high + page_size,
+ si, pi, page_size));
}
xscreensaver-5.03-screen-depth.patch:
--- NEW FILE xscreensaver-5.03-screen-depth.patch ---
--- xscreensaver-5.03/driver/lock.c.orig 2007-07-11 05:19:00.000000000 +0900
+++ xscreensaver-5.03/driver/lock.c 2007-11-01 19:03:18.000000000 +0900
@@ -1076,9 +1076,10 @@
pw->user_entry_pixmap = 0;
}
- pw->user_entry_pixmap = XCreatePixmap(si->dpy, si->passwd_dialog,
- rects[0].width, rects[0].height, pw->prompt_screen->current_depth);
-
+ pw->user_entry_pixmap =
+ XCreatePixmap (si->dpy, si->passwd_dialog,
+ rects[0].width, rects[0].height,
+ DefaultDepthOfScreen (pw->prompt_screen->screen));
XFillRectangle (si->dpy, pw->user_entry_pixmap, gc2,
0, 0, rects[0].width, rects[0].height);
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/FC-6/xscreensaver.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- xscreensaver.spec 29 Aug 2007 08:37:16 -0000 1.39
+++ xscreensaver.spec 1 Nov 2007 14:16:31 -0000 1.40
@@ -2,7 +2,13 @@
%define version 5.03
%define beta_ver %{nil}
-%define fedora_rel 1
+%if 0%{?fedora} <= 6
+%define modular_conf 0
+%define fedora_rel 1.12
+%else
+%define modular_conf 1
+%define fedora_rel 14
+%endif
%define extrarel %{nil}
@@ -22,15 +28,19 @@
Summary: X screen saver and locker
Name: %{name}
Version: %{version}
-Release: %{fedora_rel}%{?dist}%{?extrarel}.1
+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}%{?beta_ver}.tar.gz
+Source10: update-xscreensaver-hacks
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
Patch21: xscreensaver-5.03-webcollage-default-nonet.patch
Patch40: xscreensaver-5.02-pidnumber-write_long.patch
+Patch41: xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
+Patch42: xscreensaver-5.03-compiler-warning.patch
+Patch43: xscreensaver-5.03-screen-depth.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -38,45 +48,63 @@
%package base
Summary: A minimal installation of xscreensaver
Group: Amusements/Graphics
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
-BuildRequires: sed
-BuildRequires: libtool
BuildRequires: bc
+BuildRequires: desktop-file-utils
BuildRequires: gawk
+BuildRequires: gettext
+BuildRequires: libtool
BuildRequires: pam-devel > %{pam_ver}
+BuildRequires: sed
+BuildRequires: xdg-utils
BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel
+BuildRequires: libX11-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXext-devel
BuildRequires: libXinerama-devel
BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
BuildRequires: libXt-devel
BuildRequires: libXxf86misc-devel
BuildRequires: libXxf86vm-devel
+BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
-BuildRequires: gtk2-devel libglade2-devel
+BuildRequires: libglade2-devel
%if 0%{?fedora} >= 7
BuildRequires: fedora-release-notes
%else
BuildRequires: fedora-release
%endif
-Requires: /etc/pam.d/system-auth
+Requires: %{_sysconfdir}/pam.d/system-auth
Requires: pam > %{pam_ver}
+%if 0%{?fedora} >= 7
+Requires: xdg-utils
+%endif
Requires: xorg-x11-resutils
+Requires: xorg-x11-fonts-ISO8859-1-100dpi
%package extras
Summary: An enhanced set of screensavers
Group: Amusements/Graphics
BuildRequires: desktop-backgrounds-basic
-Requires: xscreensaver-base
+Requires: %{name}-base = %{epoch}:%{version}-%{release}
+
+%package gl-base
+Summary: A base package for screensavers that require OpenGL
+Group: Amusements/Graphics
+Requires: %{name}-base = %{epoch}:%{version}-%{release}
%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
-Requires: xscreensaver-base
+Obsoletes: xscreensaver-gl <= 1:5.00
+BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
+%if %{modular_conf}
+Requires: %{name}-gl-base = %{epoch}:%{version}-%{release}
+%else
+Requires: %{name}-base = %{epoch}:%{version}-%{release}
+%endif
%package extras-gss
Summary: Desktop files of extras for gnome-screensaver
@@ -128,6 +156,11 @@
Ce paquet contient une pléthore d'économiseurs d'écran graphiques
pour votre plaisir des yeux.
+%description gl-base
+A modular screen saver and locker for the X Window System.
+This package contains minimal files to make screensaver hacks
+that require OpenGL work for XScreenSaver.
+
%description gl-extras
A modular screen saver and locker for the X Window System.
This package contains a variety of OpenGL-based (3D) screen
@@ -155,6 +188,9 @@
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
%patch40 -p1 -b .pidnum_debug
+%patch41 -p1 -b .conf_max
+%patch42 -p1 -b .warn
+%patch43 -p1 -b .screen_depth
change_option(){
set +x
@@ -192,6 +228,16 @@
set -x
}
+# change some files to UTF-8
+for f in \
+ driver/XScreenSaver.ad.in \
+ hacks/glx/sproingies.man \
+ ; do
+ iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp || cp -p $f $f.tmp
+ touch -r $f $f.tmp
+ mv $f.tmp $f
+done
+
# change some options
change_option driver/XScreenSaver.ad.in \
captureStderr=False \
@@ -257,7 +303,11 @@
CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}"
CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults"
CONFIG_OPTS="$CONFIG_OPTS --disable-root-passwd"
+%if 0%{?fedora} >= 7
+CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
+%else
CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
+%endif
# This is flaky:
# CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -272,6 +322,29 @@
make %{?_smp_mflags}
+%if %{modular_conf}
+# Make XScreenSavar.ad modular
+CONFD=xscreensaver
+rm -rf $CONFD
+mkdir $CONFD
+
+# preserve the original adfile
+cp -p driver/XScreenSaver.ad $CONFD
+
+# First split XScreenSaver.ad into 3 parts
+cat driver/XScreenSaver.ad | \
+ sed -n -e '1,/\*programs/p' > $CONFD/XScreenSaver.ad.header
+cat driver/XScreenSaver.ad | sed -e '1,/\*programs/d' | \
+ sed -n -e '1,/\\n$/p' > $CONFD/XScreenSaver.ad.hacks
+cat driver/XScreenSaver.ad | sed -e '1,/\\n$/d' > $CONFD/XScreenSaver.ad.tail
+
+# Seperate XScreenSaver.ad.hacks into each hacks
+cd $CONFD
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
+
+%endif
+
%install
archdir=`./config.guess`
cd $archdir
@@ -323,6 +396,61 @@
( cd hacks/glx ; list_files install ) > $dd/gl-extras.files
( cd driver ; list_files install ) > $dd/base.files
+# Move %%{_bindir}/xscreensaver-gl-helper to gl-base
+# (bug 336331).
+%if %{modular_conf}
+echo "%%defattr(-,root,root,-)" >> $dd/gl-base.files
+
+sed -i -e '/xscreensaver-gl-helper/d' $dd/gl-extras.files
+pushd $RPM_BUILD_ROOT
+for dir in `find . -name \*xscreensaver-gl-helper\*` ; do
+ echo "${dir#.}" >> $dd/gl-base.files
+done
+popd
+sed -i -e 's|^\(%{_mandir}.*\)$|\1*|' $dd/gl-base.files
+%endif
+
+%if %{modular_conf}
+# install update script
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+install -cpm 755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}
+echo "%{_sbindir}/update-xscreensaver-hacks" >> $dd/base.files
+
+# make hack conf modular
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
+cp -p xscreensaver/XScreenSaver.ad* \
+ $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
+ $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
+
+for adfile in xscreensaver/XScreenSaver.ad.* ; do
+ filen=`basename $adfile`
+ echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
+done
+echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
+echo "%{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+ $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+ >> $dd/base.files
+
+# check symlink
+rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
+pushd ../../../..
+if [ ! $(pwd) == $RPM_BUILD_ROOT ] ; then
+ echo "Possibly symlink broken"
+ exit 1
+fi
+popd
+popd
+
+ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
+ $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
+
+%endif
+
# add documents
pushd $dd &> /dev/null
for f in README* ; do
@@ -332,7 +460,7 @@
# add directory
pushd $RPM_BUILD_ROOT
-for dir in `find .%{_prefix} -type d | grep xscreensaver` ; do
+for dir in `find . -type d | grep xscreensaver` ; do
echo "%%dir ${dir#.}" >> $dd/base.files
done
popd
@@ -376,7 +504,7 @@
echo "Exec=$COMMAND $ARG" >> $2
echo "StartupNotify=false" >> $2
echo "Type=Application" >> $2
- echo "Categories=Screensaver" >> $2
+ echo "Categories=GNOME;Screensaver;" >> $2
}
cd $dd
@@ -414,6 +542,12 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
+%if %{modular_conf}
+%post base
+%{_sbindir}/update-xscreensaver-hacks
+exit 0
+%endif
+
%files
%defattr(-,root,root,-)
@@ -423,6 +557,11 @@
%files -f extras.files extras
%defattr(-,root,root,-)
+%if %{modular_conf}
+%files -f gl-base.files gl-base
+%defattr(-,root,root,-)
+%endif
+
%files -f gl-extras.files gl-extras
%defattr(-,root,root,-)
@@ -433,6 +572,23 @@
%defattr(-,root,root,-)
%changelog
+* Thu Nov 1 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1.12
+- Patch from upstream to fix screen depth problem (also "really"
+ fix bug 336331).
+
+* Mon Oct 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1.11
+- Suppress compiler warning
+
+* Sat Oct 6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1.10
+- Fix the maximum value on demo configuration dialog
+- Change the encoding of XScreenSaver.ad and man files (bug 319101)
+
+* Tue Oct 2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1.9
+- Change the default browser to xdg-open
+
+* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1.8
+- Some cleanup.
+
* Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
- Update to 5.03
@@ -441,7 +597,7 @@
- Don't use include-directory patch anymore
- Make all xscreensaver related directories owned by -base subpackage
because now -extras and -gl-extras subpackage require it.
- - Mark man files as %%doc explicitly, because %_mandir is expanded
+ - Mark man files as %%doc explicitly, because %%_mandir is expanded
in files list
- Fix write_long() (actually no_malloc_number_to_string())
More information about the fedora-extras-commits
mailing list