- Enable daemon autostart in XFCE
- Fix Networkmanager can no longer find secrets service (#572137)
This commit is contained in:
Tomas Bzatek
parent
c636a81911
commit
59c0041b20
|
|
@ -0,0 +1,21 @@
|
|||
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
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
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
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
Summary: Framework for managing passwords and other secrets
|
||||
Name: gnome-keyring
|
||||
Version: 2.30.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
#VCS: git:git://git.gnome.org/gnome-keyring
|
||||
|
|
@ -18,6 +18,10 @@ Source: http://download.gnome.org/sources/gnome-keyring/2.30/gnome-keyring-%{ver
|
|||
# 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)
|
||||
|
||||
|
|
@ -76,9 +80,22 @@ 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
|
||||
sed -i -e 's/OnlyShowIn=GNOME;LXDE;/OnlyShowIn=GNOME;LXDE;XFCE;/g' $i;
|
||||
done
|
||||
|
||||
|
||||
%build
|
||||
libtoolize --force || :
|
||||
aclocal || :
|
||||
autoheader || :
|
||||
automake || :
|
||||
autoconf || :
|
||||
|
||||
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
|
||||
|
||||
# avoid unneeded direct dependencies
|
||||
|
|
@ -134,7 +151,7 @@ fi
|
|||
# GPL
|
||||
%{_bindir}/*
|
||||
%{_libexecdir}/*
|
||||
%{_datadir}/dbus-1/services/org.gnome.keyring.service
|
||||
%{_datadir}/dbus-1/services/*.service
|
||||
%{_datadir}/gcr
|
||||
%{_datadir}/gnome-keyring
|
||||
%{_sysconfdir}/gconf/schemas/gnome-keyring.schemas
|
||||
|
|
@ -154,6 +171,10 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* 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)
|
||||
|
||||
* Tue Apr 27 2010 Tomas Bzatek <tbzatek@redhat.com> - 2.30.1-1
|
||||
- Update to 2.30.1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue