Date: Monday, June 21, 2010 @ 08:34:51 Author: jgc Revision: 83358 upgpkg: gnome-keyring 2.30.2-1 Update to 2.30.2, remove upstream-applied patches
Modified: gnome-keyring/trunk/PKGBUILD Deleted: gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_1.patch gnome-keyring/trunk/add_service_for_org.freedesktop.secrets_2.patch -------------------------------------------------+ PKGBUILD | 24 ++++--------- add_service_for_org.freedesktop.secrets_1.patch | 40 ---------------------- add_service_for_org.freedesktop.secrets_2.patch | 21 ----------- 3 files changed, 8 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-06-21 12:31:11 UTC (rev 83357) +++ PKGBUILD 2010-06-21 12:34:51 UTC (rev 83358) @@ -1,9 +1,9 @@ #$Id$ -#Maintainer: Jan De Groot <[email protected]> +# Maintainer: Jan De Groot <[email protected]> pkgname=gnome-keyring -pkgver=2.30.1 -pkgrel=2 +pkgver=2.30.2 +pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -12,27 +12,19 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org"; install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2 - add_service_for_org.freedesktop.secrets_1.patch - add_service_for_org.freedesktop.secrets_2.patch) -sha256sums=('a76e7e06c3daa44340f8a3a0f3ef4b784973cdddff2d854cb30a3e7950796e5a' - '4172736975e9b3edb7e7aeaff11effea2a6bd9165059d977111083ad7624ad51' - '4afad6d8e84731a85162f82c995128cc0b36b3db239ef7dce1a2f742a7fe9b68') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('f65a6a786e5fbcf75f57465b8f44b17d0212b1ecb618ff5f3754806ffa5b77de') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_1.patch || return 1 - patch -Np1 -i ${srcdir}/add_service_for_org.freedesktop.secrets_2.patch || return 1 - autoconf || return 1 - automake || return 1 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs || return 1 + --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs make || return 1 - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-keyring ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } Deleted: add_service_for_org.freedesktop.secrets_1.patch =================================================================== --- add_service_for_org.freedesktop.secrets_1.patch 2010-06-21 12:31:11 UTC (rev 83357) +++ add_service_for_org.freedesktop.secrets_1.patch 2010-06-21 12:34:51 UTC (rev 83358) @@ -1,40 +0,0 @@ -From b36d6beeb2fa430210c8a2aa19f772bd75325e42 Mon Sep 17 00:00:00 2001 -From: Rob Bradford <[email protected]> -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 -+ex...@path@/gnome-keyring-daemon --start --foreground --components=secrets --- -cgit v0.8.3.1 Deleted: add_service_for_org.freedesktop.secrets_2.patch =================================================================== --- add_service_for_org.freedesktop.secrets_2.patch 2010-06-21 12:31:11 UTC (rev 83357) +++ add_service_for_org.freedesktop.secrets_2.patch 2010-06-21 12:34:51 UTC (rev 83358) @@ -1,21 +0,0 @@ -From d6bb94e9c05072fc791fb5045f5b1ab22d11d916 Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons <[email protected]> -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
