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

1.4.3-1

Browse Source 
- gpgme-1.4.3
- cleanup .spec, trim changelog
This commit is contained in:
Rex Dieter 2013-10-10 07:36:42 -05:00
parent 995c11e6f2
commit 1a5357b0cb
4 changed files with 49 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
gpgme-1.3.2-ImplicitDSOLinking.patch
View File

@ -1,100 +0,0 @@
diff -up gpgme-1.3.2/src/Makefile.am.ImplicitDSOLinking gpgme-1.3.2/src/Makefile.am
--- gpgme-1.3.2/src/Makefile.am.ImplicitDSOLinking 2012-04-13 10:01:09.000000000 +0200
+++ gpgme-1.3.2/src/Makefile.am 2012-09-26 10:06:42.822675632 +0200
@@ -223,7 +223,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI
endif
noinst_PROGRAMS = gpgme-tool
-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
install-data-local: install-def-file
diff -up gpgme-1.3.2/src/Makefile.in.ImplicitDSOLinking gpgme-1.3.2/src/Makefile.in
--- gpgme-1.3.2/src/Makefile.in.ImplicitDSOLinking 2012-05-02 11:19:10.000000000 +0200
+++ gpgme-1.3.2/src/Makefile.in 2012-09-26 10:07:14.361355694 +0200
@@ -542,7 +542,7 @@ libgpgme_pthread_la_LIBADD = $(gpgme_res
@BUILD_W32_QT_TRUE@libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
@BUILD_W32_QT_TRUE@ @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
all: all-am
.SUFFIXES:
diff -up gpgme-1.3.2/tests/gpg/Makefile.am.ImplicitDSOLinking gpgme-1.3.2/tests/gpg/Makefile.am
--- gpgme-1.3.2/tests/gpg/Makefile.am.ImplicitDSOLinking 2012-04-13 10:01:10.000000000 +0200
+++ gpgme-1.3.2/tests/gpg/Makefile.am 2012-09-26 10:08:30.059987972 +0200
@@ -47,8 +47,8 @@ EXTRA_DIST = pubdemo.asc secdemo.asc cip
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
-t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
+t_thread1_LDADD = ../../src/libgpgme-pthread.la @GPG_ERROR_LIBS@ -pthread
# We don't run t-genkey in the test suite, because it takes too long
noinst_PROGRAMS = $(TESTS) t-genkey
diff -up gpgme-1.3.2/tests/gpg/Makefile.in.ImplicitDSOLinking gpgme-1.3.2/tests/gpg/Makefile.in
--- gpgme-1.3.2/tests/gpg/Makefile.in.ImplicitDSOLinking 2012-05-02 11:19:11.000000000 +0200
+++ gpgme-1.3.2/tests/gpg/Makefile.in 2012-09-26 10:09:09.254833125 +0200
@@ -380,8 +380,8 @@ EXTRA_DIST = pubdemo.asc secdemo.asc cip
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
-t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
+t_thread1_LDADD = ../../src/libgpgme-pthread.la @GPG_ERROR_LIBS@ -pthread
all: all-am
.SUFFIXES:
diff -up gpgme-1.3.2/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.3.2/tests/gpgsm/Makefile.am
--- gpgme-1.3.2/tests/gpgsm/Makefile.am.ImplicitDSOLinking 2011-12-02 10:49:38.000000000 +0100
+++ gpgme-1.3.2/tests/gpgsm/Makefile.am 2012-09-26 10:04:36.600953929 +0200
@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
# We don't run t-genkey in the test suite, because it takes too long
# and needs a working pinentry.
diff -up gpgme-1.3.2/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.3.2/tests/gpgsm/Makefile.in
--- gpgme-1.3.2/tests/gpgsm/Makefile.in.ImplicitDSOLinking 2012-05-02 11:19:11.000000000 +0200
+++ gpgme-1.3.2/tests/gpgsm/Makefile.in 2012-09-26 10:09:38.607466053 +0200
@@ -308,7 +308,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
random_seed S.gpg-agent
diff -up gpgme-1.3.2/tests/opassuan/Makefile.am.ImplicitDSOLinking gpgme-1.3.2/tests/opassuan/Makefile.am
--- gpgme-1.3.2/tests/opassuan/Makefile.am.ImplicitDSOLinking 2010-12-30 16:19:33.000000000 +0100
+++ gpgme-1.3.2/tests/opassuan/Makefile.am 2012-09-26 10:04:36.601953950 +0200
@@ -27,7 +27,7 @@ EXTRA_DIST =
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
noinst_PROGRAMS = $(TESTS) t-command
diff -up gpgme-1.3.2/tests/opassuan/Makefile.in.ImplicitDSOLinking gpgme-1.3.2/tests/opassuan/Makefile.in
--- gpgme-1.3.2/tests/opassuan/Makefile.in.ImplicitDSOLinking 2012-05-02 11:19:11.000000000 +0200
+++ gpgme-1.3.2/tests/opassuan/Makefile.in 2012-09-26 10:04:36.601953950 +0200
@@ -259,7 +259,7 @@ noinst_HEADERS =
EXTRA_DIST =
INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
DISTCLEANFILES =
all: all-am

25
gpgme-1.4.3-no_gpgsm_t-verify.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up gpgme-1.4.3/tests/gpgsm/Makefile.in.no_t-verify gpgme-1.4.3/tests/gpgsm/Makefile.in
--- gpgme-1.4.3/tests/gpgsm/Makefile.in.no_t-verify 2013-08-12 07:36:10.000000000 -0500
+++ gpgme-1.4.3/tests/gpgsm/Makefile.in 2013-10-09 10:28:52.991728837 -0500
@@ -72,8 +72,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
TESTS = t-import$(EXEEXT) t-keylist$(EXEEXT) t-encrypt$(EXEEXT) \
- t-verify$(EXEEXT) t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
- t-export$(EXEEXT)
+ t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
+ t-export$(EXEEXT) # t-verify$(EXEEXT)
noinst_PROGRAMS = $(am__EXEEXT_1) t-genkey$(EXEEXT) \
cms-keylist$(EXEEXT) cms-decrypt$(EXEEXT)
subdir = tests/gpgsm
@@ -94,8 +94,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = t-import$(EXEEXT) t-keylist$(EXEEXT) t-encrypt$(EXEEXT) \
- t-verify$(EXEEXT) t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
- t-export$(EXEEXT)
+ t-decrypt$(EXEEXT) t-sign$(EXEEXT) \
+ t-export$(EXEEXT) # t-verify$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
cms_decrypt_SOURCES = cms-decrypt.c
cms_decrypt_OBJECTS = cms-decrypt.$(OBJEXT)

41
gpgme.spec
View File

@ -1,31 +1,34 @@
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: gpgme
Summary: GnuPG Made Easy - high level crypto API
Version: 1.3.2
Release: 4%{?dist}
Version: 1.4.3
Release: 1%{?dist}
License: LGPLv2+
Group: Applications/System
URL: http://www.gnupg.org/related_software/gpgme/
Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig
Source2: gpgme-multilib.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: gpgme-1.3.2-config_extras.patch
# fix ImplicitDSOLinking in tests/, upstreamable
Patch2: gpgme-1.3.2-ImplicitDSOLinking.patch
# gpgsm t-verify check/test hangs if using gnupg2 < 2.0.22
# see http://bugs.g10code.com/gnupg/issue1493
Patch2: gpgme-1.4.3-no_gpgsm_t-verify.patch
# add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
Patch3: gpgme-1.3.2-largefile.patch
BuildRequires: gawk
BuildRequires: gnupg2
# see patch2 above, else we only need 2.0.4
BuildRequires: gnupg2 >= 2.0.22
BuildRequires: gnupg2-smime
BuildRequires: libgpg-error-devel
BuildRequires: libgpg-error-devel >= 1.8
BuildRequires: pth-devel
BuildRequires: libassuan2-devel
BuildRequires: libassuan-devel >= 2.0.2
%define _with_gpg --with-gpg=%{_bindir}/gpg2
Requires: gnupg2
@ -41,14 +44,11 @@ management.
%package devel
Summary: Development headers and libraries for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libgpg-error-devel%{?_isa}
# http://bugzilla.redhat.com/676954
# TODO: see if -lassuan can be added to config_extras patch too -- Rex
#Requires: libassuan2-devel
# /usr/share/aclocal ownership
#Requires: automake
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
%description devel
@ -59,7 +59,7 @@ Requires(postun): /sbin/install-info
%setup -q
%patch1 -p1 -b .config_extras
%patch2 -p1 -b .ImplicitDSOLinking
#patch2 -p1 -b .no_gpgsm_t-verify
%patch3 -p1 -b .largefile
## HACK ALERT
@ -67,6 +67,7 @@ Requires(postun): /sbin/install-info
# set it to a value which we know will be suppressed.
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
%build
%configure \
--disable-static \
@ -80,9 +81,9 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT
# unpackaged files
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
rm -rf $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/gpgme/
rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
rm -rfv $RPM_BUILD_ROOT%{_datadir}/common-lisp/source/gpgme/
# Hack to resolve multiarch conflict (#341351)
%ifarch %{multilib_arches}
@ -99,14 +100,13 @@ install -m644 -p -D %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/gpgme.h
%check
make -C tests check
make check
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING* ChangeLog NEWS README* THANKS TODO VERSION
%{_libdir}/libgpgme.so.11*
%{_libdir}/libgpgme-pthread.so.11*
@ -120,7 +120,6 @@ if [ $1 -eq 0 ] ; then
fi
%files devel
%defattr(-,root,root,-)
%{_bindir}/gpgme-config
%ifarch %{multilib_arches}
%{_bindir}/gpgme-config.%{_target_cpu}
@ -133,6 +132,10 @@ fi
%changelog
* Wed Oct 09 2013 Rex Dieter <rdieter@fedoraproject.org> - 1.4.3-1
- gpgme-1.4.3
- cleanup .spec, trim changelog
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

4
sources
View File

@ -1,2 +1,2 @@
326fe97077141713f0930aa87949a287 gpgme-1.3.2.tar.bz2
4849bea218571c5ab6094d77049bd5d7 gpgme-1.3.2.tar.bz2.sig
334e524cffa8af4e2f43ae8afe585672 gpgme-1.4.3.tar.bz2
cda8a4b121dd60583db5dc3b52d9d016 gpgme-1.4.3.tar.bz2.sig