%bcond_without pth # without pth-based based version of gnupg
%bcond_without tests # testsuite on build
#
-Summary: GNU Privacy Guard - tool for secure communication and data storage - development version
-Summary(pl.UTF-8): GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozwojowa
+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.2
-Release: 1
-License: GPL
+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: 9f972c78135a7dea1bae66bb9f263980
+# 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.59
-BuildRequires: automake >= 1:1.9.3
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.10
BuildRequires: bzip2-devel
BuildRequires: curl-devel
-BuildRequires: gettext-devel >= 0.15
-BuildRequires: libassuan-devel >= 1:0.9.3
-BuildRequires: libgcrypt-devel >= 1.2.0
+BuildRequires: gettext-devel >= 0.16.1
+BuildRequires: libassuan-devel >= 1:1.0.4
+BuildRequires: libgcrypt-devel >= 1.2.2
BuildRequires: libgpg-error-devel >= 1.4
-BuildRequires: libksba-devel >= 1.0.0
+BuildRequires: libksba-devel >= 1.0.2
BuildRequires: libusb-devel
BuildRequires: openldap-devel
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)
an advanced key management facility and is compliant with the proposed
OpenPGP Internet standard as described in RFC2440.
-This is development version. Don't use it with production keys.
+This is enhanced version.
%description -l pl.UTF-8
GnuPG (GNU Privacy Guard) jest narzędziem do bezpiecznej komunikacji i
i spełnia normy zdefiniowane w standardzie OpenPGP, który jest opisany
w RFC2440.
-Wersja rozwojowa. Nie do użytku z kluczami produkcyjnymi.
+To jest wersja rozszerzona.
%package common
Summary: GnuPG - common files
Summary(pl.UTF-8): GnuPG - pliki wspólne
Group: Applications/File
-Requires: libassuan >= 1:0.9.3
+Requires: libassuan >= 1:1.0.2
+Requires: libgcrypt >= 1.2.2
Requires: libgpg-error >= 1.4
+Requires: libksba >= 1.0.2
Conflicts: gnupg-agent < 1.9.14-2
%description common
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
%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
--enable-gpg \
--enable-symcryptrun \
--with-capabilities \
+ --with-pinentry-pgm=%{_bindir}/pinentry \
--with-mailprog=/usr/lib/sendmail
%{__make}
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
%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
%files common -f gnupg2.lang
%defattr(644,root,root,755)
%doc AUTHORS main-ChangeLog NEWS README THANKS TODO
-%doc intl-ChangeLog jnlib-ChangeLog m4-ChangeLog po-ChangeLog scripts-ChangeLog common-ChangeLog kbx-ChangeLog tools-ChangeLog doc-ChangeLog
+%doc jnlib-ChangeLog m4-ChangeLog po-ChangeLog scripts-ChangeLog common-ChangeLog kbx-ChangeLog tools-ChangeLog doc-ChangeLog
%attr(755,root,root) %{_bindir}/gpg-connect-agent
%attr(755,root,root) %{_bindir}/gpgconf
%attr(755,root,root) %{_bindir}/gpgkey2ssh
%attr(755,root,root) %{_bindir}/kbxutil
%attr(755,root,root) %{_bindir}/watchgnupg
%attr(755,root,root) %{_sbindir}/addgnupghome
+%attr(755,root,root) %{_sbindir}/applygnupgdefaults
%dir %{_libexecdir}
%{_datadir}/gnupg
%{_mandir}/man1/gpg-connect-agent.1*
%{_mandir}/man1/gpgparsemail.1*
%{_mandir}/man1/watchgnupg.1*
%{_mandir}/man8/addgnupghome.8*
-%{_infodir}/*.info*
+%{_mandir}/man8/applygnupgdefaults.8*
+%{_infodir}/gnupg.info*
%files plugin-keys_curl
%defattr(644,root,root,755)
%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*