Hello community, here is the log from the commit of package gpgme for openSUSE:Factory checked in at Mon Oct 3 09:20:01 CEST 2011.
-------- --- openSUSE:Factory/gpgme/gpgme.changes 2011-09-23 11:44:40.000000000 +0200 +++ gpgme/gpgme.changes 2011-10-02 17:23:29.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Oct 2 15:20:21 UTC 2011 - [email protected] + +- Workaround qemu-arm bugs +- remove support for the "pth" library, which has not seen + mainteniance for around 5 years, native pthread support + should be just fine in linux too. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpgme.spec ++++++ --- /var/tmp/diff_new_pack.4WAxIA/_old 2011-10-03 09:19:58.000000000 +0200 +++ /var/tmp/diff_new_pack.4WAxIA/_new 2011-10-03 09:19:58.000000000 +0200 @@ -19,11 +19,6 @@ Name: gpgme BuildRequires: gpg2 >= 2.0.10 -%if 0%{?suse_version} >= 1120 -BuildRequires: libpth-devel >= 2.0.7 -%else -BuildRequires: pth >= 2.0.7 -%endif Version: 1.3.1 Release: 1 License: GPLv2+ @@ -36,7 +31,6 @@ BuildRequires: libassuan-devel >= 2.0.2 BuildRequires: libgpg-error-devel >= 1.4 PreReq: %install_info_prereq -Requires: libgpgme11 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -103,14 +97,14 @@ %prep %setup -q -%patch0 -p1 +%patch0 %build sh autogen.sh # Ensure that a (re)build uses fixed binaries with minimum version because # in case configure picks GnuPG-1.x, e.g. from /usr/local, this would cause # testsuite failures: -%configure --disable-static \ +%configure --without-pth --disable-static \ --with-gpg-version=2.0.10 \ --with-gpgsm-version=2.0.10 \ --with-gpgconf-version=2.0.10 \ @@ -124,7 +118,9 @@ rm %{buildroot}/%{_libdir}/*.la %check +%if ! 0%{?qemu_user_space_build} make check +%endif %clean rm -rf %{buildroot} @@ -150,13 +146,11 @@ %defattr(-,root,root) %{_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 %{_bindir}/gpgme-config %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h ++++++ gpgme-1.3.0-gpgme-config-remove-extraneous-libs.patch ++++++ --- /var/tmp/diff_new_pack.4WAxIA/_old 2011-10-03 09:19:58.000000000 +0200 +++ /var/tmp/diff_new_pack.4WAxIA/_new 2011-10-03 09:19:58.000000000 +0200 @@ -1,7 +1,6 @@ -diff -ur gpgme-1.3.0.orig/src/gpgme-config.in gpgme-1.3.0/src/gpgme-config.in ---- gpgme-1.3.0.orig/src/gpgme-config.in 2009-10-23 15:44:56.000000000 +0200 -+++ gpgme-1.3.0/src/gpgme-config.in 2011-01-31 15:40:34.000000000 +0100 -@@ -21,7 +21,7 @@ +--- src/gpgme-config.in.orig ++++ src/gpgme-config.in +@@ -23,7 +23,7 @@ libs="-L@libdir@" # Network libraries. assuan_cflags="@LIBASSUAN_CFLAGS@" @@ -10,3 +9,40 @@ # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -206,12 +206,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $ + libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ + @GPG_ERROR_LIBS@ + ++libgpgme_pthread_la_CFLAGS = -pthread + libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \ + $(libgpgme_version_script_cmd) -version-info \ + @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ + libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers + libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \ +- -lpthread @GPG_ERROR_LIBS@ ++ @GPG_ERROR_LIBS@ + + libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \ + $(libgpgme_version_script_cmd) -version-info \ +--- configure.ac.orig ++++ configure.ac +@@ -80,7 +80,7 @@ AM_MAINTAINER_MODE + AC_CANONICAL_HOST + + # Enable GNU extensions on systems that have them. +-AC_GNU_SOURCE ++AC_USE_SYSTEM_EXTENSIONS + + AH_VERBATIM([_REENTRANT], + [/* To allow the use of GPGME in multithreaded programs we have to use +@@ -91,7 +91,7 @@ AH_VERBATIM([_REENTRANT], + # define _REENTRANT 1 + #endif]) + +-AC_PROG_CC ++AC_PROG_CC_STDC + AC_PROG_CXX + + AC_SUBST(LIBGPGME_LT_CURRENT) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
