rpms/gpgme
7
0
Fork 0
Code Issues Pull Requests Releases Activity

gpgme-config: remove libassuan-related flags as threatened (#676954)

Browse Source 
\
devel: fix typo (broken dep)
This commit is contained in:
Rex Dieter 2011-03-17 13:18:06 -05:00
parent 60e4c3d88e
commit 8462f3af66
3 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gpgme-1.1.8-config_extras.patch
View File

@ -1,28 +0,0 @@
--- gpgme-1.1.3/src/gpgme-config.in.config_extras 2007-01-29 14:16:20.000000000 -0600
+++ gpgme-1.1.3/src/gpgme-config.in 2007-02-03 14:57:01.000000000 -0600
@@ -19,21 +19,21 @@
# 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@thread_modules="$thread_modules pth"
-libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
cflags_pth="@PTH_CFLAGS@"
@HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
-libs_pthread="-lpthread"
+#libs_pthread="-lpthread"
cflags_pthread=""
# Configure glib.
-libs_glib="@GLIB_LIBS@"
+#libs_glib="@GLIB_LIBS@"
cflags_glib="@GLIB_CFLAGS@"
with_glib=

45
gpgme-1.3.0-config_extras.patch Normal file
View File

@ -0,0 +1,45 @@
diff -up gpgme-1.3.0/src/gpgme-config.in.config_extras gpgme-1.3.0/src/gpgme-config.in
--- gpgme-1.3.0/src/gpgme-config.in.config_extras 2009-10-23 08:44:56.000000000 -0500
+++ gpgme-1.3.0/src/gpgme-config.in 2011-03-17 13:15:12.511565537 -0500
@@ -12,7 +12,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
-libdir=@libdir@
+libdir=@exec_prefix@/lib
# Make sure that no weird locale setting messes up our sed regexps etc.
LC_COLLATE=C
@@ -20,26 +20,26 @@ LC_ALL=C
LANG=C
# Network libraries.
-assuan_cflags="@LIBASSUAN_CFLAGS@"
-assuan_libs="@LIBASSUAN_LIBS@"
+#assuan_cflags="@LIBASSUAN_CFLAGS@"
+#assuan_libs="@LIBASSUAN_LIBS@"
# 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@thread_modules="$thread_modules pth"
-libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
+#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
cflags_pth="@PTH_CFLAGS@"
@HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
-libs_pthread="-lpthread"
+#libs_pthread="-lpthread"
cflags_pthread=""
# Configure glib.
-libs_glib="@GLIB_LIBS@"
+#libs_glib="@GLIB_LIBS@"
cflags_glib="@GLIB_CFLAGS@"
with_glib=

9
gpgme.spec
View File

@ -2,7 +2,7 @@
Name: gpgme
Summary: GnuPG Made Easy - high level crypto API
Version: 1.3.0
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Group: Applications/System
@ -11,7 +11,7 @@ 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)
Patch1: gpgme-1.1.8-config_extras.patch
Patch1: gpgme-1.3.0-config_extras.patch
# fix ImplicitDSOLinking in tests/, upstreamable
Patch2: gpgme-1.3.0-ImplicitDSOLinking.patch
@ -44,7 +44,7 @@ Requires: %{name} = %{version}-%{release}
Requires: libgpg-error-devel
# http://bugzilla.redhat.com/676954
# TODO: see if -lassuan can be added to config_extras patch too -- Rex
Requires: libassuan2-devel
#Requires: libassuan2-devel
# /usr/share/aclocal ownership
#Requires: automake
Requires(post): /sbin/install-info
@ -124,6 +124,9 @@ fi
%changelog
* Thu Mar 17 2011 Rex Dieter <rdieter@fedoraproject.org> - 1.3.0-4
- gpgme-config: remove libassuan-related flags as threatened (#676954)
\
* Sun Feb 13 2011 Rex Dieter <rdieter@fedoraproject.org> - 1.3.0-3
- -devel: fix typo (broken dep)