Hello community, here is the log from the commit of package gnome-screensaver for openSUSE:Factory checked in at Fri Apr 2 00:09:43 CEST 2010. -------- --- GNOME/gnome-screensaver/gnome-screensaver.changes 2010-03-31 13:53:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes 2010-03-31 13:55:35.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 31 13:53:25 CEST 2010 - vuntz@opensuse.org + +- Build against xscreensaver-data and xscreensaver-data-extra, + following the xscreensaver split. +- By default, we only have a small subset of screensavers from + xscreensaver, and they are all of good quality. This implements + fate#308474. +- Create a gnome-screensaver-extra to enable extra screensavers. + Also reduce the blacklist we have to just popsquares, which is + implemented in gnome-screensaver too. +- Remove Screensaver category from + gnome-screensaver-preferences.desktop: it should never have been + there and was causing an erroneous screensaver to appear in the + preferences. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.jEV4Ow/_old 2010-04-02 00:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.jEV4Ow/_new 2010-04-02 00:09:28.000000000 +0200 @@ -32,9 +32,10 @@ BuildRequires: pam-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: xscreensaver +BuildRequires: xscreensaver-data +BuildRequires: xscreensaver-data-extra Version: 2.30.0 -Release: 1 +Release: 2 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPLv2+ @@ -51,21 +52,38 @@ Patch10: gnome-screensaver-finger-print.patch # PATCH-FIX-UPSTREAM gnome-screensaver-multihead-unlock.patch bnc#444157 bgo#455118 rodrigo@novell.com Patch12: gnome-screensaver-multihead-unlock.patch -Requires: /sbin/unix2_chkpwd xscreensaver +Requires: /sbin/unix2_chkpwd +Requires: xscreensaver-data Requires: %{name}-lang = %{version} Provides: %{name}-devel = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %description -gnome-screensaver is a screen saver and locker that aims to - havesimple, sane, and secure defaults and to be well integrated - in the desktop. It is designed to support: * The ability to lock - down configuration settings +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 -* 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 @@ -82,7 +100,7 @@ autoreconf -f -i # FIXME: Maybe libexecdir the same as xscreensaver. %configure\ - --libexecdir=%{_prefix}/lib/%{name}\ + --libexecdir=%{_libexecdir}/%{name}\ --with-pam-prefix=/etc\ --enable-authentication-scheme=helper\ --with-passwd-helper="/sbin/unix2_chkpwd"\ @@ -95,15 +113,18 @@ %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif +%find_lang %{name} +%find_gconf_schemas %suse_update_desktop_file gnome-screensaver -%suse_update_desktop_file gnome-screensaver-preferences GNOME Screensaver X-SuSE-ControlCenter-LookAndFeel +%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 /etc/xscreensaver/*.xml | grep -v -f %{S:1} | xargs` ; do +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, @@ -111,10 +132,18 @@ sed "s/\(^Comment=.*\)/#\1/g" $file_root.desktop > $RPM_BUILD_ROOT%{_datadir}/applications/screensavers/$file_root.desktop %suse_update_desktop_file $file_root done -%find_lang %{name} -%find_gconf_schemas -cat %{name}.schemas_list >%{name}.lst -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 +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 +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 %fdupes $RPM_BUILD_ROOT %clean @@ -126,7 +155,7 @@ %preun -f %{name}.schemas_preun -%files -f %{name}.lst +%files -f %{name}.schemas_list -f screensavers.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog HACKING NEWS README TODO %config /etc/pam.d/gnome-screensaver @@ -135,7 +164,6 @@ %{_sysconfdir}/xdg/menus/gnome-screensavers.menu %{_bindir}/* %{_datadir}/applications/*.desktop -%{_datadir}/applications/screensavers/*.desktop %{_datadir}/desktop-directories/gnome-screensaver.directory %{_datadir}/backgrounds/* %{_datadir}/gnome-background-properties/cosmos.xml @@ -143,11 +171,15 @@ %{_datadir}/pixmaps/gnome-logo-white.svg %{_mandir}/man1/gnome-screensaver*.1.gz %{_libdir}/pkgconfig/gnome-screensaver.pc -%{_prefix}/lib/%{name} +%{_libexecdir}/%{name} # FIXME: Directory ownership: %dir %{_datadir}/applications/screensavers # FIXME: Maybe bad directory ownership: %dir %{_datadir}/backgrounds +%dir %{_datadir}/gnome-background-properties + +%files extra -f screensavers-extra.lst +%defattr(-,root,root) %files lang -f %{name}.lang ++++++ xscreensaver-blacklist ++++++ --- /var/tmp/diff_new_pack.jEV4Ow/_old 2010-04-02 00:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.jEV4Ow/_new 2010-04-02 00:09:28.000000000 +0200 @@ -1,19 +1 @@ -bsod.xml -barcode.xml -blitspin.xml -bouncingcow.xml -decayscreen.xml -distort.xml -flipscreen3d.xml -fliptext.xml -glsnake.xml -jigsaw.xml -mirrorblob.xml popsquares.xml -rotzoomer.xml -slidescreen.xml -sonar.xml -twang.xml -xanalogtv.xml -xflame.xml -xjack.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org