Hello community,
here is the log from the commit of package gnome-screensaver for openSUSE:Factory
checked in at Thu May 5 16:34:02 CEST 2011.
--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2011-02-13 17:23:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes 2011-04-25 16:48:17.000000000 +0200
@@ -1,0 +2,91 @@
+Mon Apr 25 16:42:03 CEST 2011 - vuntz@opensuse.org
+
+- Add gnome-screensaver-extra < 3.0 Obsoletes, as the screensavers
+ from xscreensaver are not used anymore.
+
+-------------------------------------------------------------------
+Tue Apr 5 13:31:57 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.0:
+ + Remove inihibit APIs from the documentation
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar 22 16:31:04 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.91.92:
+ + Store time values in seconds instead of minutes
+ + Don't monitor session settings
+ + Ensure the initial state of the clock is correct
+ + Remove dbus activation
+ + Remove daemonization
+ + Request shell exit overview when locking
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar 8 15:40:11 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.91.91:
+ + Follow the users clock format preference
+ + Port to GDBus
+ + Build cleanups
+ + Remove --poke option from the commandline tool (didn't work
+ anyway).
+ + Remove unused delay and timeout preferences
+ + Remove inhibit interface (inhibit the session instead)
+ + Remove theme and job support
+ + Update style to match gnome-shell
+ + Use accountsservice to get face
+ + Updated translations.
+- Remove extra package and any kind of dependency on xscreensaver
+ (xscreensaver-data Requires, and xscreensaver* BuildRequires).
+ Also remove xscreensaver-blacklist source file.
+
+-------------------------------------------------------------------
+Thu Feb 24 10:40:22 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.91.90:
+ + Use username in top panel if real name is empty
+ + Various settings fixes
+- Changes from version 2.91.3:
+ + Fix build against recent GTK+
+ + GNOME 3 style updates
+ + Updated translations
+- Changes from version 2.91.3:
+ + Fix build against recent GTK+
+ + Use GIO to launch gdmflexiserver
+ + Translation updates
+- Changes from version 2.91.2:
+ + Fix build against recent GTK+
+ + Port to GSettings
+- Changes from version 2.91.1:
+ + Fix build against recent GTK+ and gnome-desktop
+ + Port background handling to gsettings
+ + Translation updates
+- Changes from version 2.91.0:
+ + Switch to GTK+ 3.0
+ + Fix crash on systems that lack vidmode and randr extensions
+ + Add session service activation file
+ + Use better unicode symbols in strings
+ + Drop "Leave a message" feature
+ + Drop unlock dialog theme support
+ + Drop support for non-PAM based authentication
+ + Improve aesthetics of unlock dialog
+ + Monitor hotplug fixes
+ + Auto-activate screensaver when needed if not running
+ + Translation updates
+- Add gnome-screensaver-helper.patch: put back helper
+ authentication support, removed in upstream code.
+- Update gnome-screensaver-multihead-unlock.patch and
+ gnome-screensaver-xvkbd-on-lock.patch to work with GTK+ 3.
+- Change pkgconfig() BuildRequires:
+ + change gnome-desktop-2.0 to gnome-desktop-3.0, gtk+-2.0 to
+ gtk+-3.0
+ + remove libnotify
+- Remove pkgconfig(gconf-2.0) BuildRequires and
+ %gconf_schemas_prereq. Do
+ not pass --disable-schemas-install to configure, since this is
+ needed for gconf only.
+- Use %glib2_gsettings_schema_* macros.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-screensaver-2.30.2.tar.bz2
xscreensaver-blacklist
New:
----
gnome-screensaver-3.0.0.tar.bz2
gnome-screensaver-helper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.fiqrVQ/_old 2011-05-05 16:27:32.000000000 +0200
+++ /var/tmp/diff_new_pack.fiqrVQ/_new 2011-05-05 16:27:32.000000000 +0200
@@ -19,16 +19,17 @@
Name: gnome-screensaver
-Version: 2.30.2
-Release: 3
+Version: 3.0.0
+Release: 1
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPLv2+
Summary: GNOME Screen Saver and Locker
Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
-Source1: xscreensaver-blacklist
# PATCH-FEATURE-OPENSUSE gnome-screensaver-suse-pam.diff
Patch: gnome-screensaver-suse-pam.diff
+# PATCH-FIX-UPSTREAM gnome-screensaver-helper.patch bgo#640647 fcrozat@novell.com -- Put back helper authentication, removed by upstream
+Patch1: gnome-screensaver-helper.patch
# PATCH-FEATURE-OPENSUSE gnome-screensaver-xvkbd-on-lock.patch rodrigo@novell.com -- Run xvkbd when locking the screen
Patch7: gnome-screensaver-xvkbd-on-lock.patch
# PATCH-NEEDS-REBASE gnome-screensaver-2.19.1.1-securitytoken.patch
@@ -44,28 +45,20 @@
BuildRequires: pam-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-%if 0%{?suse_version} <= 1120
-BuildRequires: xscreensaver
-%else
-BuildRequires: xscreensaver-data
-BuildRequires: xscreensaver-data-extra
-%endif
BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(gconf-2.0)
-BuildRequires: pkgconfig(gnome-desktop-2.0)
-BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(gtk+-3.0)
# Needed by gnome-screensaver-finger-print.patch
BuildRequires: pkgconfig(libfprint)
BuildRequires: pkgconfig(libgnomekbdui)
BuildRequires: pkgconfig(libgnome-menu)
-BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(x11)
Requires: /sbin/unix2_chkpwd
-Requires: xscreensaver-data
Recommends: %{name}-lang
Provides: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-extra < 3.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
%description
gnome-screensaver is a screen saver and locker that aims to have
@@ -76,28 +69,12 @@
* translation into other languages
* user switching
-%package extra
-Group: System/GUI/GNOME
-License: GPLv2+
-Summary: GNOME Screen Saver and Locker -- Additional screensavers
-Requires: xscreensaver-data-extra
-Supplements: packageand(%{name}:xscreensaver-data-extra)
-BuildArch: noarch
-
-%description extra
-gnome-screensaver is a screen saver and locker that aims to have
-simple, sane, secure defaults and be well integrated in the desktop.
-It is designed to support:
-
- * the ability to lock down configuration settings
- * translation into other languages
- * user switching
-
%lang_package
%prep
%setup -q
translation-update-upstream
%patch
+%patch1 -p1
%patch7 -p1
# %patch8 -p1
%patch10
@@ -105,6 +82,7 @@
%build
# gnome-common intltool are needed only here
+# needed by patch1
autoreconf -f -i
# FIXME: Maybe libexecdir the same as xscreensaver.
%configure\
@@ -112,7 +90,6 @@
--with-pam-prefix=/etc\
--enable-authentication-scheme=helper\
--with-passwd-helper="/sbin/unix2_chkpwd"\
- --with-xscreensaverdir=/etc/xscreensaver\
--disable-docbook-docs
%__make %{?jobs:-j%jobs}
@@ -122,89 +99,31 @@
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_lang %{name} %{?no_lang_C}
-%find_gconf_schemas
%suse_update_desktop_file gnome-screensaver
-%suse_update_desktop_file gnome-screensaver-preferences GNOME X-SuSE-ControlCenter-LookAndFeel
-%suse_update_desktop_file popsquares
-%suse_update_desktop_file personal-slideshow
-%suse_update_desktop_file footlogo-floaters
-%suse_update_desktop_file cosmos-slideshow
sed -e 's/common-auth/common-auth-smartcard/g' < $RPM_BUILD_ROOT/etc/pam.d/gnome-screensaver > $RPM_BUILD_ROOT/etc/pam.d/gnome-screensaver-smartcard
-# migrate all xscreensaver savers, except blacklisted ones because they are ugly
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/screensavers
-for file in `ls -1 %{_sysconfdir}/xscreensaver/*.xml | grep -v -f %{S:1} | xargs` ; do
- file_root=`basename "$file" .xml`
- sh data/migrate-xscreensaver-config.sh $file
- # remove the Comment key: it's way too long for translators,
- # and it doesn't appear in the UI
- sed "s/\(^Comment=.*\)/#\1/g" $file_root.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/screensavers/$file_root.desktop
- %suse_update_desktop_file $file_root
-done
-rm -f screensavers.lst screensavers-extra.lst
-for file in popsquares personal-slideshow footlogo-floaters cosmos-slideshow; do
- echo %{_datadir}/applications/screensavers/$file.desktop >> screensavers.lst
-done
-%if 0%{?suse_version} <= 1120
-for file in `rpm -ql xscreensaver | grep %{_sysconfdir}/xscreensaver/.*xml`; do
- file_root=`basename "$file" .xml`
- echo %{_datadir}/applications/screensavers/$file_root.desktop >> screensavers.lst
-done
-%else
-for file in `rpm -ql xscreensaver-data | grep %{_sysconfdir}/xscreensaver/.*xml`; do
- file_root=`basename "$file" .xml`
- echo %{_datadir}/applications/screensavers/$file_root.desktop >> screensavers.lst
-done
-for file in `rpm -ql xscreensaver-data-extra | grep %{_sysconfdir}/xscreensaver/.*xml`; do
- file_root=`basename "$file" .xml`
- echo %{_datadir}/applications/screensavers/$file_root.desktop >> screensavers-extra.lst
-done
-%endif
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%pre -f %{name}.schemas_pre
-
%post
+%glib2_gsettings_schema_post
%desktop_database_post
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
-
%postun
+%glib2_gsettings_schema_postun
%desktop_database_postun
-%files -f %{name}.schemas_list -f screensavers.lst
+%files
%defattr (-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README
%config /etc/pam.d/gnome-screensaver
%config /etc/pam.d/gnome-screensaver-smartcard
%{_sysconfdir}/xdg/autostart/*.desktop
-%{_sysconfdir}/xdg/menus/gnome-screensavers.menu
%{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/desktop-directories/gnome-screensaver.directory
-%{_datadir}/backgrounds/*
-%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
-%{_datadir}/gnome-background-properties/cosmos.xml
-%{_datadir}/gnome-screensaver
-%{_datadir}/pixmaps/gnome-logo-white.svg
%{_mandir}/man1/gnome-screensaver*.1.gz
%{_libdir}/pkgconfig/gnome-screensaver.pc
%{_libexecdir}/%{name}
-# FIXME: Directory ownership:
-%dir %{_datadir}/applications/screensavers
-# FIXME: Maybe bad directory ownership:
-%dir %{_datadir}/backgrounds
-%dir %{_datadir}/gnome-background-properties
-
-%if 0%{?suse_version} > 1120
-
-%files extra -f screensavers-extra.lst
-%defattr (-, root, root)
-%endif
%files lang -f %{name}.lang
++++++ gnome-screensaver-2.30.2.tar.bz2 -> gnome-screensaver-3.0.0.tar.bz2 ++++++
++++ 104108 lines of diff (skipped)
++++++ gnome-screensaver-helper.patch ++++++
reverted:
Index: gnome-screensaver-2.91.91/configure.ac
===================================================================
--- gnome-screensaver-2.91.91.orig/configure.ac
+++ gnome-screensaver-2.91.91/configure.ac
@@ -555,6 +555,75 @@ if test "x$have_pam" = "xyes"; then
fi
+# Check for external password helper
+# On SuSE, instead of having xscreensaver be a setuid program, they
+# fork an external program that takes the password on stdin, and
+# returns true if that password is a valid one. Then only that
+# smaller program needs to be setuid.
+#
+# (Note that this external program is not a GUI: the GUI is still
+# all in xscreensaver itself; the external program just does auth.)
+
+have_passwd_helper=no
+with_passwd_helper_req=unspecified
+
+AC_ARG_WITH(passwd-helper,
+[ --with-passwd-helper Include support for an external password
+ verification helper program.],
+ [with_passwd_helper="$withval"; with_passwd_helper_req="$withval"],[with_passwd_helper=no])
+# no HANDLE_X_PATH_ARG for this one
+
+if test "$enable_locking" = no ; then
+ with_passwd_helper_req=no
+ with_passwd_helper=no
+fi
+
+case "$with_passwd_helper" in
+ ""|no) : ;;
+ /*)
+ AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper", [Full pathname of password helper application])
+ have_passwd_helper=yes;;
+ *)
+ echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2
+ exit 1
+esac
+AM_CONDITIONAL(HAVE_PASSWD_HELPER, test x$have_passwd_helper = xyes)
+AC_SUBST(HAVE_PASSWD_HELPER)
+
+dnl ---------------------------------------------------------------------------
+dnl Authentication scheme
+dnl ---------------------------------------------------------------------------
+
+AC_ARG_ENABLE(authentication-scheme,
+ [ --enable-authentication-scheme=[auto/pam/helper] Choose a specific
+ authentication scheme [default=auto]],,
+ enable_authentication_scheme=auto)
+
+AUTH_SCHEME="auth-pam"
+
+if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then
+ AC_MSG_ERROR(PAM support requested but not available)
+fi
+if test x$enable_authentication_scheme = xhelper -a x$have_passwd_helper = xno ; then
+ AC_MSG_ERROR(Password helper support requested but not available)
+fi
+
+if test x$enable_authentication_scheme = xpam ; then
+ AUTH_SCHEME="pam"
+elif test x$enable_authentication_scheme = xhelper ; then
+ AUTH_SCHEME="helper"
+elif test x$enable_authentication_scheme = xauto ; then
+ if test x$have_pam != xno ; then
+ AUTH_SCHEME="pam"
+ elif test x$have_passwd_helper != xno ; then
+ AUTH_SCHEME="helper"
+ fi
+else
+ AC_MSG_ERROR(Unknown authentication scheme)
+fi
+
+AC_SUBST(AUTH_SCHEME)
+
dnl ---------------------------------------------------------------------------
dnl libgnomekbd
dnl ---------------------------------------------------------------------------
@@ -731,6 +800,9 @@ echo "
Screen locking enabled: ${enable_locking}
Show keyboard indicator: ${with_kbd_layout_indicator}
PAM prefix: ${PAM_PREFIX}
+ Have password helper: ${have_passwd_helper}
+ Authentication scheme: ${AUTH_SCHEME}"
+
-"
+echo ""
Index: gnome-screensaver-2.91.91/src/Makefile.am
===================================================================
--- gnome-screensaver-2.91.91.orig/src/Makefile.am
+++ gnome-screensaver-2.91.91/src/Makefile.am
@@ -63,6 +63,11 @@ gnome_screensaver_command_LDADD = \
$(GNOME_SCREENSAVER_COMMAND_LIBS) \
$(NULL)
+AUTH_SOURCES = \
+ gs-auth.h \
+ gs-auth-@AUTH_SCHEME@.c \
+ $(NULL)
+
test_fade_SOURCES = \
test-fade.c \
gs-fade.c \
@@ -78,8 +83,7 @@ test_fade_LDADD = \
test_passwd_SOURCES = \
test-passwd.c \
- gs-auth.h \
- gs-auth-pam.c \
+ $(AUTH_SOURCES) \
setuid.c \
setuid.h \
subprocs.c \
@@ -136,8 +140,13 @@ gnome_screensaver_dialog_SOURCES = \
setuid.h \
subprocs.c \
subprocs.h \
- gs-auth.h \
- gs-auth-pam.c \
+ $(AUTH_SOURCES) \
+ $(NULL)
+
+EXTRA_gnome_screensaver_dialog_SOURCES = \
+ gs-auth-pam.c \
+ gs-auth-helper.c \
+ gs-auth-pwent.c \
$(NULL)
gnome_screensaver_dialog_LDADD = \
Index: gnome-screensaver-2.91.91/src/gs-auth-helper.c
===================================================================
--- /dev/null
+++ gnome-screensaver-2.91.91/src/gs-auth-helper.c
@@ -0,0 +1,198 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * written by Olaf Kirch