From e64f9d95bb64d387acf28a973f7740f8ee3e3ed5 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Feb 01 2005 19:47:28 +0000 Subject: auto-import gpgme-1.0.2-1 on branch devel from gpgme-1.0.2-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e2704a6..328b3a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gpgme-0.4.3.tar.gz +gpgme-1.0.2.tar.bz2 diff --git a/gpgme-0.4.3-select.patch b/gpgme-0.4.3-select.patch deleted file mode 100644 index a9aa2ff..0000000 --- a/gpgme-0.4.3-select.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gpgme-0.4.3-orig/gpgme/wait-private.c gpgme-0.4.3/gpgme/wait-private.c ---- gpgme-0.4.3-orig/gpgme/wait-private.c 2003-07-31 17:20:56.000000000 +0200 -+++ gpgme-0.4.3/gpgme/wait-private.c 2004-12-13 20:15:43.758995584 +0100 -@@ -121,6 +121,7 @@ - _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &err); - return err; - } -+ break; - } - } - diff --git a/gpgme-1.0.2.tar.bz2.sig b/gpgme-1.0.2.tar.bz2.sig new file mode 100644 index 0000000..eda53aa Binary files /dev/null and b/gpgme-1.0.2.tar.bz2.sig differ diff --git a/gpgme.spec b/gpgme.spec index 47c658b..f6342f4 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -1,19 +1,23 @@ -Name: gpgme -Version: 0.4.3 -Release: 4 -Epoch: 0 -Summary: GnuPG Made Easy - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpgme/ -Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/gpgme-0.4.3.tar.gz -Patch: gpgme-0.4.3-select.patch + +Name: gpgme +Epoch: 0 +Version: 1.0.2 +Release: 1%{?dist_tag} +Summary: GnuPG Made Easy - high level crypto API +License: LGPL +Group: Applications/System +URL: http://www.gnupg.org/related_software/gpgme/ +Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2 +Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.0.2.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gnupg >= 0:1.2.2, %{_bindir}/gpgsm, pth-devel -BuildRequires: libgpg-error-devel >= 0:0.5 -Requires: gnupg >= 0:1.2.2, %{_bindir}/gpgsm +BuildRequires: gnupg >= 0:1.2.2 +BuildRequires: gnupg2 >= 0:1.9.6 +BuildRequires: pth-devel +BuildRequires: libgpg-error-devel >= 0:0.5 + +Requires: gnupg >= 0:1.2.2 +Requires: gnupg2 >= 0:1.9.6 %description GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG @@ -21,35 +25,38 @@ easier for applications. It provides a high-level crypto API for encryption, decryption, signing, signature verification and key management. -%package devel -Summary: Static libraries and header files from GPGME, GnuPG Made Easy -Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release}, libgpg-error-devel +%package devel +Summary: Static libraries and header files from GPGME, GnuPG Made Easy +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: libgpg-error-devel Requires(post): /sbin/install-info Requires(postun): /sbin/install-info - %description devel Static libraries and header files from GPGME, GnuPG Made Easy. %prep %setup -q -%patch -p1 -b .select %build -%configure --enable-static +%configure \ + --program-prefix="%{?_program_prefix}" \ + --enable-static + make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT + rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/*.la} %check || : -make check +make check %clean @@ -59,19 +66,19 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig + %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : %postun devel if [ $1 -eq 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info \ - %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : fi %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README* THANKS TODO VERSION +%doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION %{_libdir}/libgpgme*.so.* %files devel @@ -85,8 +92,19 @@ fi %changelog -* Tue Dec 14 2004 Michael Schwendt - 0:0.4.3-4 -- Add similar fd select race/lockup fix as for GPGME 0.3.16. +* Tue Feb 1 2005 Michael Schwendt - 0:1.0.2-1 +- LGPL used here, and made summary more explicit. +- Remove dirmngr dependency (gpgsm interfaces with it). + +* Thu Jan 06 2005 Rex Dieter 0:1.0.2-0.fdr.1 +- 1.0.2 + +* Thu Oct 21 2004 Rex Dieter 0:1.0.0-0.fdr.1 +- 1.0.0 +- Requires: dirmngr + +* Tue Oct 19 2004 Rex Dieter 0:0.4.7-0.fdr.1 +- 0.4.7 * Sun May 2 2004 Ville Skyttä - 0:0.4.3-0.fdr.3 - Require %%{_bindir}/gpgsm instead of newpg. diff --git a/sources b/sources index e8543a2..a33ea8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4cb2a2ba1689f0376bc1affc987f183 gpgme-0.4.3.tar.gz +25513fd35593bad08c1e486878296b40 gpgme-1.0.2.tar.bz2