rpms/xscreensaver/F-7 xscreensaver-5.03-demo-conf-maxvalue-plus1.patch, NONE, 1.1 xscreensaver.spec, 1.44, 1.45
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Oct 6 14:10:38 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19310/F-7
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
Log Message:
* Sat Oct 6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
- Fix the maximum value on demo configuration dialog
- Change the encoding of XScreenSaver.ad and man files
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));
}
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xscreensaver.spec 15 Sep 2007 14:47:58 -0000 1.44
+++ xscreensaver.spec 6 Oct 2007 14:10:06 -0000 1.45
@@ -7,7 +7,7 @@
%define fedora_rel 1.1
%else
%define modular_conf 1
-%define fedora_rel 6
+%define fedora_rel 10
%endif
%define extrarel %{nil}
@@ -38,6 +38,7 @@
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
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -45,45 +46,52 @@
%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}
+Requires: xdg-utils
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-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
+Requires: %{name}-base = %{epoch}:%{version}-%{release}
%package extras-gss
Summary: Desktop files of extras for gnome-screensaver
@@ -162,6 +170,7 @@
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
%patch40 -p1 -b .pidnum_debug
+%patch41 -p1 -b .conf_max
change_option(){
set +x
@@ -199,6 +208,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 \
@@ -264,7 +283,7 @@
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"
-CONFIG_OPTS="$CONFIG_OPTS --with-browser=htmlview"
+CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
# This is flaky:
# CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -372,7 +391,7 @@
echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/$filen" >> $dd/base.files
done
echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
-echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
+echo "%{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
$dd/base.files
echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
>> $dd/base.files
@@ -447,7 +466,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
@@ -510,6 +529,22 @@
%defattr(-,root,root,-)
%changelog
+* Sat Oct 6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
+- Fix the maximum value on demo configuration dialog
+- Change the encoding of XScreenSaver.ad and man files
+
+* Tue Oct 2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-9
+- Change the default browser to xdg-open
+- Don't mark XScreenSaver.ad as %%config. This file is overwritten
+ automatically.
+
+* Mon Sep 24 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-8
+- Some cleanup.
+
+* Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
+- Remove noreplace flag from XScreenSaver.ad as this is updated
+ automatically.
+
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
correctly.
More information about the fedora-extras-commits
mailing list