- BR: libassuan-devel >= 1:1.0.4

[packages/gnupg2.git] / gnupg2.spec

diff --git a/gnupg2.spec b/gnupg2.spec
index a2d795ca83ceca50b60162bf3fde4810ee93128b..4df28e57d8890e63604a52889340614ec0a5b38a 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,24 +6,26 @@
 Summary:       GNU Privacy Guard - tool for secure communication and data storage - enhanced version
 Summary(pl.UTF-8):     GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
 Name:          gnupg2
-Version:       2.0.6
-Release:       1
+Version:       2.0.9
+Release:       3
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: f2bbbfaa320a359a28122e224ff660ce
+# Source0-md5: b41f3f6716a74c46a609a71853e85c7b
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pth.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-disable_tests.patch
+# this patch is shared with gnupg.spec
+Patch4:                gnupg-gcc.patch
 URL:           http://www.gnupg.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: gettext-devel >= 0.16.1
-BuildRequires: libassuan-devel >= 1:1.0.2
+BuildRequires: libassuan-devel >= 1:1.0.4
 BuildRequires: libgcrypt-devel >= 1.2.2
 BuildRequires: libgpg-error-devel >= 1.4
 BuildRequires: libksba-devel >= 1.0.2
@@ -34,6 +36,7 @@ BuildRequires:        pcsc-lite-devel
 BuildRequires: rpmbuild(macros) >= 1.177
 BuildRequires: texinfo
 BuildRequires: zlib-devel
+Suggests:      gnupg-agent
 Requires:      gnupg2-common = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -126,7 +129,7 @@ Summary:    GnuPG extension - agent
 Summary(pl.UTF-8):     Rozszerzenie GnuPG - agent
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
-Requires:      pinentry
+Requires:      pinentry >= 0.7.5-2
 Obsoletes:     newpg
 
 %description -n gnupg-agent
@@ -179,9 +182,12 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %patch1 -p1
 %patch2 -p1
 %{!?with_tests:%patch3 -p1}
+%patch4 -p0
 
 rm -f po/stamp-po
 
+sed -i -e 's#gl_AC_TYPE_LONG_LONG#AC_TYPE_LONG_LONG_INT#g' gl/m4/allocsa.m4
+
 %build
 %{__gettextize}
 %{__aclocal} -I m4 -I gl/m4
@@ -193,9 +199,10 @@ rm -f po/stamp-po
        --enable-gpg \
        --enable-symcryptrun \
        --with-capabilities \
+       --with-pinentry-pgm=%{_bindir}/pinentry \
        --with-mailprog=/usr/lib/sendmail
 
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -208,7 +215,7 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d/gnupg-agent.sh
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gnupg-agent.sh
 
 mv ChangeLog main-ChangeLog || :
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
+find -name ChangeLog | awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}' | sh
 
 %find_lang gnupg2
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
@@ -216,11 +223,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%post  -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
+%postun        -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2
 %banner gnupg-agent-1.9.16-2 << EOF
@@ -256,7 +263,7 @@ EOF
 %{_mandir}/man1/watchgnupg.1*
 %{_mandir}/man8/addgnupghome.8*
 %{_mandir}/man8/applygnupgdefaults.8*
-%{_infodir}/*.info*
+%{_infodir}/gnupg.info*
 
 %files plugin-keys_curl
 %defattr(644,root,root,755)
@@ -289,6 +296,7 @@ EOF
 %attr(755,root,root) %{_bindir}/scdaemon
 %attr(755,root,root) %{_bindir}/symcryptrun
 %attr(755,root,root) %{_libexecdir}/gnupg-pcsc-wrapper
+%attr(755,root,root) %{_libexecdir}/gpg-check-pattern
 %attr(755,root,root) %{_libexecdir}/gpg-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
 %{_mandir}/man1/gpg-agent.1*