commit gnome-screensaver for openSUSE:Factory
Hello community, here is the log from the commit of package gnome-screensaver for openSUSE:Factory checked in at Fri May 14 00:46:00 CEST 2010. -------- --- GNOME/gnome-screensaver/gnome-screensaver.changes 2010-03-31 13:55:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes 2010-04-09 18:08:46.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 9 18:08:16 CEST 2010 - vuntz@opensuse.org + +- Fix build on openSUSE 11.2: xscreensaver was not split there. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.vqPPES/_old 2010-05-14 00:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.vqPPES/_new 2010-05-14 00:45:44.000000000 +0200 @@ -32,10 +32,14 @@ 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 Version: 2.30.0 -Release: 2 +Release: 3 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPLv2+ @@ -136,6 +140,12 @@ 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 @@ -144,6 +154,7 @@ file_root=`basename "$file" .xml` echo %{_datadir}/applications/screensavers/$file_root.desktop >> screensavers-extra.lst done +%endif %fdupes $RPM_BUILD_ROOT %clean @@ -178,8 +189,11 @@ %dir %{_datadir}/backgrounds %dir %{_datadir}/gnome-background-properties +%if 0%{?suse_version} > 1120 + %files extra -f screensavers-extra.lst -%defattr(-,root,root) +%defattr (-, root, root) +%endif %files lang -f %{name}.lang ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de