diff --git a/seahorse-gpg-version.patch b/seahorse-gpg-version.patch new file mode 100644 index 0000000..78294fd --- /dev/null +++ b/seahorse-gpg-version.patch @@ -0,0 +1,18 @@ +gpg 1.x has been dropped; see +http://lists.opensuse.org/opensuse-factory/2007-06/msg00142.html + +Index: seahorse-1.0.1/configure.in +=================================================================== +--- seahorse-1.0.1.orig/configure.in ++++ seahorse-1.0.1/configure.in +@@ -83,8 +83,8 @@ AC_ARG_ENABLE(gpg-check, + DO_CHECK=$enableval, DO_CHECK=yes) + + if test "$DO_CHECK" = "yes"; then +- accepted_versions="1.2 1.4" +- AC_PATH_PROG(GNUPG, gpg, no) ++ accepted_versions="1.2 1.4 2.0" ++ AC_PATH_PROG(GNUPG, gpg2, no) + ok="no" + if test "$GNUPG" != "no"; then + AC_MSG_CHECKING(for appropriate GnuPG version) diff --git a/seahorse.changes b/seahorse.changes index 2baf209..bad2097 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 22 23:31:47 CEST 2007 - maw@suse.de + +- s/gpg/gpg2/ in the buildreq +- Add seahorse-gpg-version.patch to allow builds when only gpg2 + is installed. + ------------------------------------------------------------------- Wed Jun 6 01:23:33 CEST 2007 - ro@suse.de diff --git a/seahorse.spec b/seahorse.spec index f82d08a..f5857b2 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -11,17 +11,18 @@ # norootforbuild Name: seahorse -BuildRequires: gnome-doc-utils-devel gnome-themes gpg gpgme-devel intltool libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel openssh perl-XML-Parser update-desktop-files +BuildRequires: gnome-doc-utils-devel gnome-themes gpg2 gpgme-devel intltool libglade2-devel libgnomeprintui-devel libgpg-error-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel openssh perl-XML-Parser update-desktop-files License: GNU General Public License (GPL) Group: System/GUI/GNOME Autoreqprov: on PreReq: gconf2 Version: 1.0.1 -Release: 18 +Release: 25 Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 Patch2: %{name}-gpgme-version.patch Patch3: abuild.patch +Patch4: %{name}-gpg-version.patch URL: http://seahorse.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,6 +64,7 @@ Authors: %setup %patch2 %patch3 -p1 +%patch4 -p1 %build %{?suse_update_config:%{suse_update_config -f}} @@ -150,6 +152,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libcryptui/*.h %changelog +* Fri Jun 22 2007 - maw@suse.de +- s/gpg/gpg2/ in the buildreq +- Add seahorse-gpg-version.patch to allow builds when only gpg2 + is installed. * Wed Jun 06 2007 - ro@suse.de - added gpg to buildreq * Mon Apr 16 2007 - maw@suse.de