[mate-control-center] add mate-control-center_use-gnome-keyring_instead-of-mate-keyring.patch to spec file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sat Oct 19 15:02:59 UTC 2013


commit 850dda8f67777f7a57a00443035b4218aae39d35
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Oct 19 17:02:48 2013 +0200

    add mate-control-center_use-gnome-keyring_instead-of-mate-keyring.patch to spec file

 mate-control-center.spec |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 77add4d..240f70e 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,11 +1,18 @@
 Name:           mate-control-center
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
 Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 
+# upstream patch
+# swithch to gnome-keyring > f19
+# http://git.mate-desktop.org/mate-control-center/commit/?id=2b05d5f
+%if 0%{?fedora} > 19
+Patch0:        mate-control-center_use-gnome-keyring_instead-of-mate-keyring.patch
+%endif
+
 BuildRequires: dconf-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -25,6 +32,12 @@ BuildRequires: unique-devel
 
 Requires: gsettings-desktop-schemas
 Requires: hicolor-icon-theme
+# keyring support
+%if 0%{?fedora} > 19
+Requires: gnome-keyring
+%else
+Requires: mate-keyring
+%endif
 Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
 
 
@@ -56,6 +69,10 @@ Development files for mate-control-center
 %prep
 %setup -q
 
+%if 0%{?fedora} > 19
+%patch0 -p1 -b .gnome-keyring
+%endif
+
 %build
 %configure --disable-static          \
            --disable-schemas-compile \
@@ -149,6 +166,9 @@ fi
 
 
 %changelog
+* Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-3
+- switch to gnome-keyring for > f19
+
 * Tue Jul 31 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-2
 - add mate-control-center-file-system subpackage
 - add requires hicolor-icon-theme


More information about the scm-commits mailing list