rpms/gpgme/FC-4 gpgme-1.1.2-config_extras.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gpgme.spec, 1.11, 1.12 sources, 1.4, 1.5 gpgme-1.0.2-macro.patch, 1.1, NONE gpgme-1.0.3-tests.patch, 1.1, NONE gpgme-1.1.0-tests.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gpgme.spec sources 
Added Files:
	gpgme-1.1.2-config_extras.patch 
Removed Files:
	gpgme-1.0.2-macro.patch gpgme-1.0.3-tests.patch 
	gpgme-1.1.0-tests.patch 
Log Message:
* Mon Mar 6 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-4
- add back support for gpgme-config --thread=pthread

* Mon Mar 6 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-2
- drop extraneous libs from gpgme-config

* Fri Mar 3 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-1
- 1.1.2
- drop upstreamed gpgme-1.1.0-tests.patch


gpgme-1.1.2-config_extras.patch:

--- NEW FILE gpgme-1.1.2-config_extras.patch ---
--- gpgme-1.1.2/gpgme/gpgme-config.in.config_extras	2005-11-18 17:03:28.000000000 -0600
+++ gpgme-1.1.2/gpgme/gpgme-config.in	2006-03-06 08:50:57.000000000 -0600
@@ -16,15 +16,19 @@
 
 # Configure libgpg-error.
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
-gpg_error_libs="@GPG_ERROR_LIBS@"
+#gpg_error_libs="@GPG_ERROR_LIBS@"
 
 # Configure thread packages.
 thread_modules=""
 
 @HAVE_PTH_TRUE at thread_modules="$thread_modules pth"
-libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
 cflags_pth="@PTH_CFLAGS@"
 
+ at HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
+#libs_pthread="@PTHREAD_LDFLAGS@ @PTHREAD_LIBS@"
+cflags_pthread="@PTHREAD_CFLAGS@"
+
 # Configure glib.
 libs_glib="@GLIB_LIBS@"
 cflags_glib="@GLIB_CFLAGS@"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2005 13:43:53 -0000	1.4
+++ .cvsignore	11 May 2006 19:38:48 -0000	1.5
@@ -1,2 +1,2 @@
-gpgme-1.0.3.tar.bz2
-gpgme-1.0.3.tar.bz2.sig
+gpgme-1.1.2.tar.bz2
+gpgme-1.1.2.tar.bz2.sig


Index: gpgme.spec
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/gpgme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gpgme.spec	6 Dec 2005 14:05:39 -0000	1.11
+++ gpgme.spec	11 May 2006 19:38:48 -0000	1.12
@@ -1,8 +1,8 @@
 
 Name:    gpgme
 Summary: GnuPG Made Easy - high level crypto API
-Version: 1.0.3
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 4%{?dist}
 
 License: LGPL
 Group:   Applications/System
@@ -11,8 +11,7 @@
 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
-Patch1: gpgme-1.0.3-tests.patch
+Patch1: gpgme-1.1.2-config_extras.patch
 
 BuildRequires: gnupg >= 1.2.2
 BuildRequires: gnupg2 >= 1.9.6
@@ -44,8 +43,7 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .macro
-%patch1 -p1 -b .tests
+%patch1 -p1 -b .config_extras
 
 
 %build
@@ -65,7 +63,8 @@
 
 
 %check || :
-make check
+# expect 1(+?) errors with gnupg < 1.2.4
+make check 
 
 
 %clean
@@ -100,8 +99,24 @@
 
 
 %changelog
-* Tue Dec 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.3-2
-- tests.patch so 'make check' passes
+* Mon Mar 6 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-4
+- add back support for gpgme-config --thread=pthread
+
+* Mon Mar 6 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-2
+- drop extraneous libs from gpgme-config
+
+* Fri Mar 3 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.2-1
+- 1.1.2
+- drop upstreamed gpgme-1.1.0-tests.patch
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
+* Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.0-3
+- (re)build against (newer) libksba/gnupg2
+
+* Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.1.0-2
+- 1.1.0
 
 * Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.0.3-1
 - 1.0.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpgme/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2005 13:43:53 -0000	1.4
+++ sources	11 May 2006 19:38:48 -0000	1.5
@@ -1,2 +1,2 @@
-84f85671d63164fb1d338c23010f023d  gpgme-1.0.3.tar.bz2
-f91f3a341c0070aef7cec52e3cb4d770  gpgme-1.0.3.tar.bz2.sig
+7c2333679035a5f37e99630a156a40ca  gpgme-1.1.2.tar.bz2
+5b786d78d322ea0778eea5ae67c087b4  gpgme-1.1.2.tar.bz2.sig


--- gpgme-1.0.2-macro.patch DELETED ---


--- gpgme-1.0.3-tests.patch DELETED ---


--- gpgme-1.1.0-tests.patch DELETED ---