Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
6bfe7dcfe7 | ||
|
a79666bfd8 | ||
|
4c440e9d09 | ||
|
c09ffe6183 | ||
|
92098336f6 |
@ -1 +0,0 @@
|
||||
gnome-keyring-2.26.1.tar.bz2
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
gnome-keyring-2.26.3.tar.bz2
|
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: gnome-keyring
|
||||
# $Id: Makefile,v 1.1 2004/09/09 05:26:08 cvsdist Exp $
|
||||
NAME := gnome-keyring
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attempt a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
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
|
@ -7,14 +7,17 @@
|
||||
|
||||
Summary: Framework for managing passwords and other secrets
|
||||
Name: gnome-keyring
|
||||
Version: 2.26.1
|
||||
Release: 1%{?dist}
|
||||
Version: 2.26.3
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
Source: http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-%{version}.tar.bz2
|
||||
URL: http://www.gnome.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# http://bugzilla.redhat.com/453880
|
||||
Patch4: gnome-keyring-2.28.2-autostart_remove_onlyshowin.patch
|
||||
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: gtk2-devel >= %{gtk2_version}
|
||||
BuildRequires: GConf2-devel
|
||||
@ -66,6 +69,13 @@ automatically unlock the "login" keyring when the user logs in.
|
||||
%prep
|
||||
%setup -q -n gnome-keyring-%{version}
|
||||
|
||||
%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
|
||||
%configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
|
||||
|
||||
@ -142,6 +152,14 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.26.3-2
|
||||
- pam_gnome_keyring.so doesn't initialize properly on != gnome (#453880)
|
||||
- hack out %%_libdir rpaths
|
||||
|
||||
* Tue Jun 30 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.3-1
|
||||
- Update to 2.26.3
|
||||
- See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.3.news
|
||||
|
||||
* Sun Apr 12 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1
|
||||
- Update to 2.26.1
|
||||
- See http://download.gnome.org/sources/gnome-keyring/2.26/gnome-keyring-2.26.1.news
|
||||
|
Loading…
Reference in New Issue
Block a user