rpms
/
gnome-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 2.30.3

This commit is contained in:
Tomas Bzatek 2010-06-24 12:30:26 +00:00
parent 15ee0e4dca
commit fd02abbeff
3 changed files with 8 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnome-keyring-2.30.2-fix-service-file-creation.patch
View File

@ -1,21 +0,0 @@
From d6bb94e9c05072fc791fb5045f5b1ab22d11d916 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Mon, 19 Apr 2010 13:47:26 +0000
Subject: Make sure the service files are created correctly
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 4c95b5a..9edb13f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -68,7 +68,7 @@ service_DATA = $(service_in_files:.service.in=.service)
service_PATH = $(VALGRIND_RUN)$(bindir)
# Rule to make the service file with bindir expanded
-$(service_DATA): $(service_in_files) Makefile
+%.service: %.service.in Makefile
@sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
desktop_in_files = \
--
cgit v0.8.3.1

40
gnome-keyring-2.30.2-use-org.freedesktop.secrets.patch
View File

@ -1,40 +0,0 @@
From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rob@linux.intel.com>
Date: Wed, 14 Apr 2010 18:12:41 +0000
Subject: Add dbus activation service file for org.freedesktop.secrets
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=611002
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index be96523..4c95b5a 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -54,14 +54,16 @@ gnome_keyring_daemon_LDADD = \
EXTRA_DIST = \
org.gnome.keyring.service.in \
+ org.freedesktop.secrets.service.in \
$(desktop_in_files)
CLEANFILES = \
org.gnome.keyring.service \
+ org.freedesktop.service \
$(desktop_DATA)
servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = org.gnome.keyring.service.in
+service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in
service_DATA = $(service_in_files:.service.in=.service)
service_PATH = $(VALGRIND_RUN)$(bindir)
diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in
new file mode 100644
index 0000000..d4db713
--- a/dev/null
+++ b/daemon/org.freedesktop.secrets.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.secrets
+Exec=@PATH@/gnome-keyring-daemon --start --foreground --components=secrets
--
cgit v0.8.3.1

18
gnome-keyring.spec
View File

@ -7,23 +7,20 @@
Summary: Framework for managing passwords and other secrets
Name: gnome-keyring
Version: 2.30.1
Release: 2%{?dist}
Version: 2.30.3
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/gnome-keyring
Source: http://download.gnome.org/sources/gnome-keyring/2.30/gnome-keyring-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# http://bugzilla.redhat.com/529709
# http://bugs.gnome.org/598494
Patch3: gnome-keyring-2.28.1-nopass.patch
# from upstream
Patch4: gnome-keyring-2.30.2-use-org.freedesktop.secrets.patch
Patch5: gnome-keyring-2.30.2-fix-service-file-creation.patch
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
@ -80,8 +77,6 @@ automatically unlock the "login" keyring when the user logs in.
%prep
%setup -q -n gnome-keyring-%{version}
%patch3 -p1 -b .no-pass
%patch4 -p1 -b .use-org.freedesktop.secrets
%patch5 -p1 -b .fix-service-file-creation
# Enable daemon autostart in XFCE
for i in daemon/*.desktop.in.in; do
@ -171,6 +166,9 @@ fi
%changelog
* Thu Jun 24 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.3-1
- Update to 2.30.3
* Mon May 3 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-2
- Enable daemon autostart in XFCE
- Fix Networkmanager can no longer find secrets service (#572137)