- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
- hack out %_libdir rpaths
This commit is contained in:
parent
95db9de2c3
commit
2a60941305
22
gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch
Normal file
22
gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff -up gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in.OnlyShowIn gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in
|
||||||
|
--- gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in.OnlyShowIn 2009-04-17 21:51:49.000000000 -0500
|
||||||
|
+++ gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.in 2010-01-04 11:37:19.726652487 -0600
|
||||||
|
@@ -2,7 +2,6 @@
|
||||||
|
Type=Application
|
||||||
|
_Name=GNOME Keyring Daemon
|
||||||
|
Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start
|
||||||
|
-OnlyShowIn=GNOME;
|
||||||
|
X-GNOME-Autostart-Phase=Initialization
|
||||||
|
X-GNOME-AutoRestart=false
|
||||||
|
X-GNOME-Autostart-Notify=true
|
||||||
|
diff -up gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.OnlyShowIn gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in
|
||||||
|
--- gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in.OnlyShowIn 2009-12-14 08:42:13.000000000 -0600
|
||||||
|
+++ gnome-keyring-2.28.2/daemon/gnome-keyring-daemon.desktop.in 2010-01-04 11:37:26.233651799 -0600
|
||||||
|
@@ -2,7 +2,6 @@
|
||||||
|
Type=Application
|
||||||
|
_Name=GNOME Keyring Daemon
|
||||||
|
Exec= gnome-keyring-daemon --start
|
||||||
|
-OnlyShowIn=GNOME;
|
||||||
|
X-GNOME-Autostart-Phase=Initialization
|
||||||
|
X-GNOME-AutoRestart=false
|
||||||
|
X-GNOME-Autostart-Notify=true
|
@ -8,7 +8,7 @@
|
|||||||
Summary: Framework for managing passwords and other secrets
|
Summary: Framework for managing passwords and other secrets
|
||||||
Name: gnome-keyring
|
Name: gnome-keyring
|
||||||
Version: 2.28.2
|
Version: 2.28.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
|
Source: http://download.gnome.org/sources/gnome-keyring/2.28/gnome-keyring-%{version}.tar.bz2
|
||||||
@ -20,6 +20,9 @@ Patch2: gnome-keyring-2.28.0-die-on-session-exit.patch
|
|||||||
# http://bugs.gnome.org/598494
|
# http://bugs.gnome.org/598494
|
||||||
Patch3: gnome-keyring-2.28.1-nopass.patch
|
Patch3: gnome-keyring-2.28.1-nopass.patch
|
||||||
|
|
||||||
|
# http://bugzilla.redhat.com/453880
|
||||||
|
Patch4: gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch
|
||||||
|
|
||||||
URL: http://www.gnome.org
|
URL: http://www.gnome.org
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -74,6 +77,12 @@ automatically unlock the "login" keyring when the user logs in.
|
|||||||
%setup -q -n gnome-keyring-%{version}
|
%setup -q -n gnome-keyring-%{version}
|
||||||
%patch2 -p1 -b .die-on-session-exit
|
%patch2 -p1 -b .die-on-session-exit
|
||||||
%patch3 -p1 -b .no-pass
|
%patch3 -p1 -b .no-pass
|
||||||
|
%patch4 -p1 -b .autostart_remove_onlyshowin
|
||||||
|
|
||||||
|
# hack to nuke rpaths
|
||||||
|
%if "%{_libdir}" != "/usr/lib"
|
||||||
|
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
|
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
|
||||||
@ -151,6 +160,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.28.2-2
|
||||||
|
- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
|
||||||
|
- hack out %%_libdir rpaths
|
||||||
|
|
||||||
* Wed Dec 16 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.28.2-1
|
* Wed Dec 16 2009 Tomas Bzatek <tbzatek@redhat.com> - 2.28.2-1
|
||||||
- Update to 2.28.2
|
- Update to 2.28.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user