From 73f2a7f59396644cb10a2ddda2837112480c78ae2685e0ac7d6534118b0fb0d5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 1 Apr 2010 13:29:33 +0000 Subject: [PATCH] Accepting request 36537 from Base:System checked in (request 36537) OBS-URL: https://build.opensuse.org/request/show/36537 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=8 --- gpgme-1.1.8-makecheck.patch | 13 +++++++++++++ gpgme-1.2.0.tar.bz2 | 3 +++ gpgme-1.3.0.tar.bz2 | 3 --- gpgme.changes | 23 ----------------------- gpgme.spec | 30 +++++++++++++++++------------- 5 files changed, 33 insertions(+), 39 deletions(-) create mode 100644 gpgme-1.1.8-makecheck.patch create mode 100644 gpgme-1.2.0.tar.bz2 delete mode 100644 gpgme-1.3.0.tar.bz2 diff --git a/gpgme-1.1.8-makecheck.patch b/gpgme-1.1.8-makecheck.patch new file mode 100644 index 0000000..9a1fcd8 --- /dev/null +++ b/gpgme-1.1.8-makecheck.patch @@ -0,0 +1,13 @@ + +If the dummy pinentry script is not excutable, 10 tests FAIL: + +Index: tests/gpg/Makefile.am +=================================================================== +--- tests/gpg/Makefile.am (revision 1301) ++++ tests/gpg/Makefile.am (working copy) +@@ -71,4 +71,5 @@ + + ./gpg-agent.conf: + # This is required for gpg2, which does not support command fd. ++ chmod +x $(abs_srcdir)/pinentry + echo pinentry-program $(abs_srcdir)/pinentry > ./gpg-agent.conf diff --git a/gpgme-1.2.0.tar.bz2 b/gpgme-1.2.0.tar.bz2 new file mode 100644 index 0000000..27bc9b7 --- /dev/null +++ b/gpgme-1.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4ba555ea795a42061f0b03fffe22b3f1cb22fcdbcc0bbbeb0419e59b04ef801 +size 845063 diff --git a/gpgme-1.3.0.tar.bz2 b/gpgme-1.3.0.tar.bz2 deleted file mode 100644 index cecff04..0000000 --- a/gpgme-1.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74e040fcd46061f6b0d8b621a2a2a48100a7ba5c9f69e7cf207259a6e2e3e6a1 -size 869470 diff --git a/gpgme.changes b/gpgme.changes index 561090a..320179c 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Wed Mar 31 13:22:35 UTC 2010 - puzel@novell.com - -- update to gpgme-1.3 - * GPGME does not come with an internal libassuan version anymore. - The external libassuan 1.1.0 release or later is required. For - application programmers on systems that can resolve inter-library - dependencies at runtime, this is a transparent change. - * New engine GPGME_PROTOCOL_G13 to support the new g13 tool. - * New engine GPGME_PROTOCOL_UISERVER to support UI Servers. - * New API to change the passpgrase of a key. - * Interface changes relative to the 1.2.0 release: - - GPGME_STATUS_INV_SGNR NEW. - - GPGME_STATUS_NO_SGNR NEW. - - GPGME_PROTOCOL_G13 NEW. - - gpgme_op_g13_mount NEW. - - gpgme_g13_result_t NEW. - - GPGME_PK_ECDSA NEW. - - GPGME_PK_ECDH NEW. - - gpgme_op_passwd_start NEW. - - gpgme_op_passwd NEW. -- drop gpgme-1.1.8-makecheck.patch (not needed) - ------------------------------------------------------------------- Sun Jan 31 23:27:18 UTC 2010 - jengelh@medozas.de diff --git a/gpgme.spec b/gpgme.spec index e262211..c7954aa 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,5 +1,5 @@ # -# spec file for package gpgme (Version 1.3.0) +# spec file for package gpgme (Version 1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,15 +22,15 @@ Name: gpgme BuildRequires: gpg2 >= 2.0.10 BuildRequires: libpth-devel >= 2.0.7 BuildRequires: libgpg-error-devel >= 1.4 -BuildRequires: libassuan-devel >= 1.1.0 License: GPLv2+ Group: Productivity/Security -Requires: %install_info_prereq +PreReq: %install_info_prereq AutoReqProv: on -Version: 1.3.0 +Version: 1.2.0 Release: 2 Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 Source2: baselibs.conf +Patch1: %{name}-1.1.8-makecheck.patch Url: http://www.gnupg.org/related_software/gpgme/ Summary: A Library Designed to Give Applications Easy Access to GnuPG Requires: gpg2 @@ -51,6 +51,7 @@ Authors of MUAs should especially consider using GPGME. Creating a set of standard widgets for common key selection tasks is even planned. + Authors: -------- FSF @@ -102,8 +103,8 @@ License: GPLv2+ Summary: A Library Designed to give Applications easy Access to GnuPG Group: Development/Libraries/C and C++ Requires: libgpgme11 = %{version} libgpg-error-devel glibc-devel libpth-devel -Provides: gpgme-devel = %{version} -Obsoletes: gpgme-devel < %{version} +Provides: gpgme-devel = %{version} +Obsoletes: gpgme-devel <= %{version} %description -n libgpgme-devel GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -136,6 +137,7 @@ Authors: %prep %setup -q +%patch1 %build sh autogen.sh @@ -156,6 +158,7 @@ sh autogen.sh rm %buildroot/%_libdir/*.la %check +# With patch2 and upstream, gpg tests use a dummy pinentry script, so run them: make check %clean @@ -178,19 +181,20 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog README NEWS THANKS TODO %{_datadir}/common-lisp %{_datadir}/common-lisp/source -%{_infodir}/gpgme* +#%#{_datadir}/common-lisp/source/gpgme +%_infodir/gpgme* %files -n libgpgme11 %defattr(-,root,root) -%{_libdir}/libgpgme.so.* -%{_libdir}/libgpgme-pthread.so.* -%{_libdir}/libgpgme-pth.so.* +%_libdir/libgpgme.so.* +%_libdir/libgpgme-pthread.so.* +%_libdir/libgpgme-pth.so.* %files -n libgpgme-devel %defattr(-,root,root) -%{_libdir}/libgpgme.so -%{_libdir}/libgpgme-pthread.so -%{_libdir}/libgpgme-pth.so +%_libdir/libgpgme.so +%_libdir/libgpgme-pthread.so +%_libdir/libgpgme-pth.so %{_bindir}/gpgme-config %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h