diff --git a/gnome-settings-daemon-2.25.92.tar.bz2 b/gnome-settings-daemon-2.25.92.tar.bz2 deleted file mode 100644 index 05ed5b1..0000000 --- a/gnome-settings-daemon-2.25.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0fc19581896822c84b207f51fadae29d7b69433526c73efc99efc9b1eef48cec -size 1114325 diff --git a/gnome-settings-daemon-2.26.0.tar.bz2 b/gnome-settings-daemon-2.26.0.tar.bz2 new file mode 100644 index 0000000..4d22bd8 --- /dev/null +++ b/gnome-settings-daemon-2.26.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20502568f82ce92bc26122ceafae0f63ed71bfba0366db03c163c8567db2a103 +size 1143867 diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 9f28e20..d3f64e4 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 16 18:15:22 CET 2009 - vuntz@novell.com + +- Update to version 2.26.0: + + Make build work with -Wl,-z,defs (bgo#574452) + + Updated translations. +- Remove -fno-strict-aliasing from CFLAGS. +- Remove AutoReqProv: it's default now. +- Remove BuildRequires on gnome-control-center and own directories + instead, to avoid a build loop. + ------------------------------------------------------------------- Tue Mar 10 21:53:17 CET 2009 - vuntz@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index ff11e0e..f98fafa 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.25.92) +# spec file for package gnome-settings-daemon (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,6 @@ Name: gnome-settings-daemon %define _name gnome-settings-daemon BuildRequires: fdupes BuildRequires: gnome-common -# For directory ownership -BuildRequires: gnome-control-center BuildRequires: gnome-desktop-devel BuildRequires: gnome-patch-translation BuildRequires: intltool @@ -35,7 +33,7 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11 License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.25.92 +Version: 2.26.0 Release: 1 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 @@ -51,7 +49,6 @@ Url: http://www.gnome.org Requires: %{name}-lang = %{version} Obsoletes: resapplet BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on %gconf_schemas_prereq %description @@ -109,8 +106,6 @@ gnome-patch-translation-update %build autoreconf -f -i -# needed for control-center-2.16.1: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ --libexecdir=%{_prefix}/lib/gnome-settings-daemon\ --disable-static\ @@ -148,6 +143,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-settings-daemon-2.0 %{_sysconfdir}/xdg/autostart/*.desktop %{_datadir}/icons/*/*/* +# Own the directories to avoid a build dependency on gnome-control-center +# (which creates a loop) +%dir %{_datadir}/gnome-control-center +%dir %{_datadir}/gnome-control-center/keybindings %{_datadir}/gnome-control-center/keybindings/50-accessibility.xml %files lang -f %{_name}.lang @@ -158,6 +157,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 16 2009 vuntz@novell.com +- Update to version 2.26.0: + + Make build work with -Wl,-z,defs (bgo#574452) + + Updated translations. +- Remove -fno-strict-aliasing from CFLAGS. +- Remove AutoReqProv: it's default now. +- Remove BuildRequires on gnome-control-center and own directories + instead, to avoid a build loop. * Tue Mar 10 2009 vuntz@novell.com - Drop gnome-settings-daemon-bnc369263-broken-xkb-layout.patch: we now have a recent enough X server. Fix bnc#483651.