rpms/xscreensaver/devel xscreensaver-5.00-browser-setting.patch, NONE, 1.1 xscreensaver-5.00-change-defaults.patch, NONE, 1.1 xscreensaver-5.00-locale-decimal.patch, NONE, 1.1 xscreensaver-5.00-rootpasswd.patch, NONE, 1.1 xscreensaver.spec, 1.1, 1.2
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed May 31 14:13:44 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1586
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.00-browser-setting.patch
xscreensaver-5.00-change-defaults.patch
xscreensaver-5.00-locale-decimal.patch
xscreensaver-5.00-rootpasswd.patch
Log Message:
* Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-2
- Change the default text.
- Rewrite root passwd patch.
- Add browser option to configure.
- Fix requirement about desktop-backgrounds-basic
- Fix decimal separator problem reported by upstream.
xscreensaver-5.00-browser-setting.patch:
--- NEW FILE xscreensaver-5.00-browser-setting.patch ---
--- xscreensaver-5.00/configure.in.browser-setting 2006-05-24 07:07:00.000000000 +0900
+++ xscreensaver-5.00/configure.in 2006-05-31 03:42:39.000000000 +0900
@@ -1793,6 +1793,40 @@
###############################################################################
#
+# Whether to allow root password to unblank.
+#
+###############################################################################
+AC_ARG_ENABLE(root-passwd, [
+ --enable-root-passwd Allow root passwd to unlock screen.
+ --disable-root-passwd Do not allow that.],
+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes])
+if test "$enable_root_passwd" = yes; then
+ AC_DEFINE(ALLOW_ROOT_PASSWD)
+ true
+elif test "$enable_root_passwd" != no; then
+ echo "error: something wrong with root-passwd option. Check configure.in ."
+ exit 1
+fi
+
+###############################################################################
+#
+# Whether to allow root password to unblank.
+#
+###############################################################################
+AC_ARG_ENABLE(root-passwd, [
+ --enable-root-passwd Allow root passwd to unlock screen.
+ --disable-root-passwd Do not allow that.],
+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes])
+if test "$enable_root_passwd" = yes; then
+ AC_DEFINE(ALLOW_ROOT_PASSWD)
+ true
+elif test "$enable_root_passwd" != no; then
+ echo "error: something wrong with root-passwd option. Check configure.in ."
+ exit 1
+fi
+
+###############################################################################
+#
# Check for PAM.
#
###############################################################################
@@ -2430,6 +2464,7 @@
# Check for the various Gnome help and URL loading programs.
#
+WITH_BROWSER=gnome-open
if test "$have_gtk" = yes; then
AC_CHECK_PROGS(gnome_open_program, gnome-open)
AC_CHECK_PROGS(gnome_url_show_program, gnome-url-show)
@@ -3359,6 +3394,45 @@
###############################################################################
#
+# Check the browser to see help URL
+#
+###############################################################################
+
+have_browser=no
+with_browser_req=unspecified
+
+AC_ARG_WITH(browser,
+[ --with-browser=BROWSER Specify the browser to show help URL.],
+ [with_browser="$withval"; with_browser_req="$withval"],
+ [with_browser=no ])
+# no HANDLE_X_PATH_ARG for this one
+
+case "$with_browser" in
+ no )
+ ;;
+ * )
+ WITH_BROWSER=$with_browser
+ gnome_open_program=$with_browser
+ AC_MSG_CHECKING([for browser $with_browser])
+ with_browser_fullpath=`which $with_browser 2>/dev/null`
+ case $with_browser_fullpath in
+ /* )
+ AC_MSG_RESULT(yes)
+ have_browser=yes
+ ;;
+ * )
+ AC_MSG_RESULT(no)
+# Only warning: we don't want to install all packages for the
+# dependency of the browser in building stage...
+ echo "WARNING: browser not found: --with-browser=$with_browser"
+ ;;
+ esac
+ ;;
+esac
+ac_cv_browser="$with_browser"
+
+###############################################################################
+#
# Check whether it's ok to install some hacks as setuid (e.g., "sonar")
# This should be safe, but let's give people the option.
#
@@ -3579,6 +3653,7 @@
AC_SUBST(DEFAULT_IMAGES_P)
AC_SUBST(DEFAULT_IMAGE_DIRECTORY)
AC_SUBST(DEFAULT_TEXT_FILE)
+AC_SUBST(WITH_BROWSER)
AC_SUBST(OBJCC)
AC_SUBST(EXES_OSX)
--- xscreensaver-5.00/driver/XScreenSaver.ad.in.browser-setting 2006-05-24 08:01:34.000000000 +0900
+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:44:31.000000000 +0900
@@ -93,7 +93,7 @@
!
! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
!
- at GNOME24@*loadURL: gnome-open '%s'
+ at GNOME24@*loadURL: @WITH_BROWSER@ '%s'
@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
@GNOME24@ --command '/bin/sh -c "man %s; read foo"'
!
xscreensaver-5.00-change-defaults.patch:
--- NEW FILE xscreensaver-5.00-change-defaults.patch ---
--- xscreensaver-5.00/driver/XScreenSaver.ad.in.change-defaults 2006-05-31 02:38:54.000000000 +0900
+++ xscreensaver-5.00/driver/XScreenSaver.ad.in 2006-05-31 03:08:33.000000000 +0900
@@ -37,24 +37,24 @@
*dpmsStandby: 2:00:00
*dpmsSuspend: 2:00:00
*dpmsOff: 4:00:00
-*grabDesktopImages: True
+*grabDesktopImages: False
*grabVideoFrames: False
*chooseRandomImages: @DEFAULT_IMAGES_P@
*imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
*nice: 10
*memoryLimit: 0
-*lock: False
+*lock: True
*verbose: False
*timestamp: True
*fade: True
*unfade: False
*fadeSeconds: 0:00:03
*fadeTicks: 20
-*splash: True
+*splash: False
*splashDuration: 0:00:05
*visualID: default
*captureStderr: True
-*ignoreUninstalledPrograms: False
+*ignoreUninstalledPrograms: True
*textMode: file
*textLiteral: XScreenSaver
@@ -229,7 +229,7 @@
epicycle -root \n\
interference -root \n\
truchet -root \n\
- bsod -root \n\
+- bsod -root \n\
crystal -root \n\
discrete -root \n\
kumppa -root \n\
xscreensaver-5.00-locale-decimal.patch:
--- NEW FILE xscreensaver-5.00-locale-decimal.patch ---
--- xscreensaver-5.00/utils/resources.c.localefix 2006-02-11 13:25:37.000000000 +0900
+++ xscreensaver-5.00/utils/resources.c 2006-05-31 18:27:51.000000000 +0900
@@ -12,6 +12,9 @@
#include "utils.h"
#include "resources.h"
+#ifdef HAVE_SETLOCALE
+#include <locale.h>
+#endif
extern char *progname;
@@ -124,15 +127,32 @@
{
double val;
char c, *s = get_string_resource (dpy, res_name, res_class);
+
+#ifdef HAVE_SETLOCALE
+ const char *current_locale;
+#endif
+
if (! s) return 0.0;
+
+#ifdef HAVE_SETLOCALE
+ current_locale = setlocale(LC_ALL, NULL);
+ (void) setlocale(LC_ALL, "C");
+#endif
+
if (1 == sscanf (s, " %lf %c", &val, &c))
{
free (s);
+#ifdef HAVE_SETLOCALE
+ (void) setlocale(LC_ALL, current_locale);
+#endif
return val;
}
fprintf (stderr, "%s: %s must be a float, not %s.\n",
progname, res_name, s);
free (s);
+#ifdef HAVE_SETLOCALE
+ (void) setlocale(LC_ALL, current_locale);
+#endif
return 0.0;
}
xscreensaver-5.00-rootpasswd.patch:
--- NEW FILE xscreensaver-5.00-rootpasswd.patch ---
--- xscreensaver-5.00/config.h.in.rootpasswd 2006-05-18 08:36:52.000000000 +0900
+++ xscreensaver-5.00/config.h.in 2006-05-31 00:09:40.000000000 +0900
@@ -398,6 +398,11 @@
/* Define this to remove the option of locking the screen at all. */
#undef NO_LOCKING
+/* Define this if allowing root passwd to unlock screen
+ Default is YES!!
+*/
+#undef ALLOW_ROOT_PASSWD
+
/* This is the same as GETTEXT_PACKAGE, but for the glade generated code. */
#undef PACKAGE
--- xscreensaver-5.00/configure.in.rootpasswd 2006-05-24 07:07:00.000000000 +0900
+++ xscreensaver-5.00/configure.in 2006-05-31 00:31:29.000000000 +0900
@@ -1793,6 +1793,23 @@
###############################################################################
#
+# Whether to allow root password to unblank.
+#
+###############################################################################
+AC_ARG_ENABLE(root-passwd, [
+ --enable-root-passwd Allow root passwd to unlock screen.
+ --disable-root-passwd Do not allow that.],
+ [enable_root_passwd="$enableval"],[enable_root_passwd=yes])
+if test "$enable_root_passwd" = yes; then
+ AC_DEFINE(ALLOW_ROOT_PASSWD)
+ true
+elif test "$enable_root_passwd" != no; then
+ echo "error: something wrong with root-passwd option. Check configure.in ."
+ exit 1
+fi
+
+###############################################################################
+#
# Check for PAM.
#
###############################################################################
--- xscreensaver-5.00/driver/passwd-pam.c.rootpasswd 2006-05-17 11:14:58.000000000 +0900
+++ xscreensaver-5.00/driver/passwd-pam.c 2006-05-31 00:09:40.000000000 +0900
@@ -288,6 +288,7 @@
goto DONE;
}
+#ifdef ALLOW_ROOT_PASSWD
/* If that didn't work, set the user to root, and try to authenticate again.
*/
if (user) free (user);
@@ -300,6 +301,7 @@
if (status != PAM_SUCCESS) goto DONE;
PAM_NO_DELAY(pamh);
+#endif
set = block_sigchld();
status = pam_authenticate (pamh, 0);
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver.spec 26 May 2006 18:20:03 -0000 1.1
+++ xscreensaver.spec 31 May 2006 14:13:44 -0000 1.2
@@ -1,9 +1,10 @@
%define name xscreensaver
%define version 5.00
-%define fedora_rel 1
+%define fedora_rel 2
-%define default_text %{_datadir}/doc/fedora-release-5.89/RELEASE-NOTES
+%define fedora_ver 5.89
+%define default_text %{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,12 +17,15 @@
Group: Amusements/Graphics
URL: http://www.jwz.org/xscreensaver/
Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
-Patch0: xscreensaver-5.00b5-change-defaults.patch
+Patch0: xscreensaver-5.00-browser-setting.patch
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
-Patch5: xscreensaver-5.00b5-dont-allow-root.patch
+Patch5: xscreensaver-5.00-rootpasswd.patch
Patch8: xscreensaver-5.00b5-include-directory.patch
Patch101: xscreensaver-5.00-locale-safety.patch
Patch102: xscreensaver-5.00-matherr-utils.patch
+Patch103: xscreensaver-5.00-change-defaults.patch
+Patch104: xscreensaver-5.00-locale-decimal.patch
+
# find_lang
BuildRequires: gettext
@@ -44,13 +48,16 @@
BuildRequires: libXxf86vm-devel
BuildRequires: libjpeg-devel
BuildRequires: gtk2-devel libglade2-devel
-Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic
+Requires: /etc/pam.d/system-auth, htmlview
Provides: xscreensaver = %{epoch}:%{version}-%{release}
Obsoletes: xscreensaver
%package extras
Summary: An enhanced set of screensavers
Group: Amusements/Graphics
+# Switch desktop-backgrounds-basic from Requires to BuildRequires as
+# configure needs it but xscreensaver can get along with no images.
+BuildRequires: desktop-backgrounds-basic
%package gl-extras
Summary: An enhanced set of screensavers that require OpenGL
@@ -84,12 +91,14 @@
%prep
%setup -q
-%patch0 -p1 -b .change-defaults
+%patch0 -p1 -b .browser-setting
%patch1 -p1 -b .sanitize-hacks
-%patch5 -p1 -b .dont-allow-root
+%patch5 -p1 -b .rootpasswd
%patch8 -p1 -b .include-dir
%patch101 -p1 -b .locale-safety
%patch102 -p1 -b .matherr2
+%patch103 -p1 -b .change-defaults
+%patch104 -p1 -b .locale-decimal
sed -i -e 's|version [45].[0-9a-z][0-9a-z]*|version %{version}|' \
driver/XScreenSaver.ad.in
@@ -133,6 +142,8 @@
CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks"
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"
# This is flaky:
# CONFIG_OPTS="$CONFIG_OPTS --with-login-manager"
@@ -226,6 +237,13 @@
%defattr(-,root,root)
%changelog
+* Wed May 31 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-2
+- Change the default text.
+- Rewrite root passwd patch.
+- Add browser option to configure.
+- Fix requirement about desktop-backgrounds-basic
+- Fix decimal separator problem reported by upstream.
+
* Fri May 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-1
- Update to 5.00
- Switch to extras, don't remove anything.
More information about the fedora-extras-commits
mailing list