diff options
| -rw-r--r-- | packaging/build_gpgme-config.patch | 17 | ||||
| -rw-r--r-- | packaging/gpgme.spec | 5 |
2 files changed, 21 insertions, 1 deletions
diff --git a/packaging/build_gpgme-config.patch b/packaging/build_gpgme-config.patch new file mode 100644 index 0000000..c6d7882 --- /dev/null +++ b/packaging/build_gpgme-config.patch @@ -0,0 +1,17 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 67805a8..e475afb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -26,11 +26,8 @@ EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ + gpgme.h.in versioninfo.rc.in gpgme.def \ + gpgme.pc.in gpgme-glib.pc.in + +-if USE_GPGRT_CONFIG +-noinst_SCRIPTS = gpgme-config +-else + bin_SCRIPTS = gpgme-config +-endif ++ + m4datadir = $(datadir)/aclocal + m4data_DATA = gpgme.m4 + nodist_include_HEADERS = gpgme.h diff --git a/packaging/gpgme.spec b/packaging/gpgme.spec index f358bc4..bada3b9 100644 --- a/packaging/gpgme.spec +++ b/packaging/gpgme.spec @@ -23,6 +23,7 @@ Url: http://www.gnupg.org/related_software/gpgme/ Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 Source2: baselibs.conf Source1001: gpgme.manifest +Source1002: build_gpgme-config.patch BuildRequires: automake BuildRequires: autoconf BuildRequires: libassuan-devel >= 2.4.2 @@ -90,6 +91,7 @@ of standard widgets for common key selection tasks is even planned. %prep %setup -q cp %{SOURCE1001} . +%{__patch} -p1 < %{SOURCE1002} %build sh autogen.sh @@ -103,7 +105,7 @@ languages="cl cpp" --disable-fd-passing \ --enable-languages="${languages}" -%make_build +%{__make} %{?_smp_mflags} %install %make_install @@ -137,5 +139,6 @@ languages="cl cpp" %{_datadir}/aclocal/gpgme.m4 %{_includedir}/gpgme.h %{_includedir}/gpgme++/* +%{_bindir}/gpgme-config %changelog |