rpms/gpgme/FC-3 gpgme-1.0.2-macro.patch, NONE, 1.1 gpgme-1.1.0-tests.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gpgme.spec, 1.6, 1.7 sources, 1.3, 1.4 gpgme-1.0.2.tar.bz2.sig, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Dec 6 13:48:46 UTC 2005


Author: rdieter

Update of /cvs/extras/rpms/gpgme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9884

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.0.2-macro.patch gpgme-1.1.0-tests.patch 
Removed Files:
	gpgme-1.0.2.tar.bz2.sig 
Log Message:
* Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.0.3-1
- 1.0.3
- --disable-static


gpgme-1.0.2-macro.patch:

--- NEW FILE gpgme-1.0.2-macro.patch ---
--- gpgme/ath-compat.c~	2004-12-07 23:11:52.000000000 +0200
+++ gpgme/ath-compat.c	2005-03-18 12:54:44.000000000 +0200
@@ -108,7 +108,7 @@
 ath_read (int fd, void *buf, size_t nbytes)
 {
   if (ath_ops && ath_ops->read)
-    return ath_ops->read (fd, buf, nbytes);
+    return (ath_ops->read) (fd, buf, nbytes);
   else
     return read (fd, buf, nbytes);
 }

gpgme-1.1.0-tests.patch:

--- NEW FILE gpgme-1.1.0-tests.patch ---
--- gpgme-1.1.0/tests/gpgsm/t-keylist.c.tests	2005-09-08 09:42:32.000000000 -0500
+++ gpgme-1.1.0/tests/gpgsm/t-keylist.c	2005-10-11 09:24:40.000000000 -0500
@@ -44,6 +44,7 @@
   char *issuer_name;
   char *chain_id;
   char *uid;
+  char *email;
   gpgme_validity_t validity;
   unsigned int key_length;
 }
@@ -53,7 +54,7 @@
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
       "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
       "CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=D\xc3\xbcsseldorf,C=DE",
-      GPGME_VALIDITY_ULTIMATE, 1024
+      NULL, GPGME_VALIDITY_ULTIMATE, 1024
     },
     { "DFA56FB5FC41E3A8921F77AD1622EEFD9152A5AD", 0, 909684190, 1009821790, "01",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -63,7 +64,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Top Level Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_NEVER, 2048
+      "<certify at pca.dfn.de>", GPGME_VALIDITY_NEVER, 2048
     },
     { "2C8F3C356AB761CB3674835B792CDA52937F9285", 0, 973183644, 1009735200, "15",
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
@@ -73,7 +74,7 @@
       "1.2.840.113549.1.9.1=#63657274696679407063612E64666E2E6465,"
       "CN=DFN Server Certification Authority,OU=DFN-PCA,"
       "O=Deutsches Forschungsnetz,C=DE",
-      GPGME_VALIDITY_UNKNOWN, 2048
+      "<certify at pca.dfn.de>", GPGME_VALIDITY_UNKNOWN, 2048
     },
     { NULL }
   };
@@ -286,7 +287,8 @@
 	  exit (1);
 	}
 
-      if (!key->uids || key->uids->next)
+      /* Be tolerant against a missing email (ie, older gpgsm versions).  */
+      if (!key->uids || (key->uids->next && !keys[i].email))
 	{
 	  fprintf (stderr, "Key has unexpected number of user IDs\n");
 	  exit (1);
@@ -336,6 +338,13 @@
 		   key->uids->uid);
 	  exit (1);
 	}
+      if (key->uids->next && strcmp (key->uids->next->uid, keys[i].email))
+	{
+	  fprintf (stderr, "Unexpected email in user ID: %s\n",
+		   key->uids->next->uid);
+	  exit (1);
+	}
+
 
       gpgme_key_unref (key);
       i++;
--- gpgme-1.1.0/tests/gpg/t-sig-notation.c.tests	2005-09-30 21:06:08.000000000 -0500
+++ gpgme-1.1.0/tests/gpg/t-sig-notation.c	2005-10-11 09:24:40.000000000 -0500
@@ -42,8 +42,8 @@
   { "laughing at me",
     "Just Squeeze Me",
     GPGME_SIG_NOTATION_HUMAN_READABLE },
-  { "leave at home",
-    "Right Now",
+  { "preferred-email-encoding at pgp.com",
+    "pgpmime",
     GPGME_SIG_NOTATION_HUMAN_READABLE | GPGME_SIG_NOTATION_CRITICAL },
   { NULL, 
     "http://www.gnu.org/policy/",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Feb 2005 19:47:28 -0000	1.3
+++ .cvsignore	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-gpgme-1.0.2.tar.bz2
+gpgme-1.0.3.tar.bz2
+gpgme-1.0.3.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/gpgme.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpgme.spec	1 Feb 2005 19:52:10 -0000	1.6
+++ gpgme.spec	6 Dec 2005 13:48:43 -0000	1.7
@@ -1,25 +1,27 @@
 
-Name:	 gpgme
-Epoch:	 0
-Version: 1.0.2
-Release: 1%{?dist_tag}
+Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
+Version: 1.0.3
+Release: 1%{?dist}
+
 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
-BuildRequires: gnupg2 >= 0:1.9.6
-BuildRequires: pth-devel
-BuildRequires: libgpg-error-devel >= 0:0.5
+Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: gpgme-1.0.2-macro.patch
+
+BuildRequires: gnupg >= 1.2.2
+BuildRequires: gnupg2 >= 1.9.6
+BuildRequires: libgpg-error-devel >= 0.5
+BuildRequires: pth-devel >= 2.0.4
 
-Requires: gnupg >= 0:1.2.2
-Requires: gnupg2 >= 0:1.9.6
+Requires: gnupg >= 1.2.2
+Requires: gnupg2 >= 1.9.6
 
-Obsoletes: cryptplug <= 0:0.3.16-2
+Obsoletes: cryptplug <= 0.3.16-2
 
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
@@ -28,37 +30,41 @@
 management.
 
 %package devel
-Summary:  Static libraries and header files from GPGME, GnuPG Made Easy
+Summary:  Development headers and libraries for %{name}
 Group:    Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{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.
+%description devel
+%{summary}
 
 
 %prep
 %setup -q
 
+%patch0 -p0 -b .tests
+
 
 %build
 %configure \
-  --program-prefix="%{?_program_prefix}" \
-  --enable-static
+  --disable-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}
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %check || :
-make check 
+# expect t-keylist failure, reported upstream
+make check ||:
 
 
 %clean
@@ -66,8 +72,8 @@
 
 
 %post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
 
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
@@ -81,19 +87,28 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
-%{_libdir}/libgpgme*.so.*
+%{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gpgme-config
-%{_includedir}/gpgme.h
-%{_libdir}/libgpgme*.a
-%{_libdir}/libgpgme*.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_datadir}/aclocal/gpgme.m4
 %{_infodir}/gpgme.info*
 
 
 %changelog
+* Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.0.3-1
+- 1.0.3
+- --disable-static
+
+* Thu May 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-3
+- rebuilt
+
+* Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-2
+- Fix FC4 build.
+
 * Tue Feb  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.0.2-1
 - LGPL used here, and made summary more explicit.
 - Remove dirmngr dependency (gpgsm interfaces with it).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Feb 2005 19:47:28 -0000	1.3
+++ sources	6 Dec 2005 13:48:43 -0000	1.4
@@ -1 +1,2 @@
-25513fd35593bad08c1e486878296b40  gpgme-1.0.2.tar.bz2
+84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
+f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig


--- gpgme-1.0.2.tar.bz2.sig DELETED ---




More information about the scm-commits mailing list