- updated to 2.0.18

[packages/gnupg2.git] / gnupg2.spec

diff --git a/gnupg2.spec b/gnupg2.spec
index 2bcf143171b0cc38628be7c7ceff47783da9d1d8..b833dcb8d765b8be5df76267c4e5e84cc96c2c7a 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,28 +6,28 @@
 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.11
-Release:       2
+Version:       2.0.18
+Release:       1
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: a3014f3b3c919662278060f9a4818b89
+# Source0-md5: 2f37e0722666a0fedbe4d9f9227ac4d7
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pth.patch
-Patch2:                %{name}-pl.po-update.patch
-Patch3:                %{name}-disable_tests.patch
+Patch2:                %{name}-disable_tests.patch
+Patch3:                %{name}-pl.po-update.patch
 URL:           http://www.gnupg.org/
 BuildRequires: adns-devel
 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.4
-BuildRequires: libgcrypt-devel >= 1.2.2
-BuildRequires: libgpg-error-devel >= 1.4
-BuildRequires: libksba-devel >= 1.0.2
+BuildRequires: curl-devel >= 7.10
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: libassuan-devel >= 1:2.0.0
+BuildRequires: libgcrypt-devel >= 1.4.0
+BuildRequires: libgpg-error-devel >= 1.7
+BuildRequires: libksba-devel >= 1.0.7
 BuildRequires: libusb-compat-devel
 BuildRequires: openldap-devel
 BuildRequires: pcsc-lite-devel
@@ -62,10 +62,10 @@ To jest wersja rozszerzona.
 Summary:       GnuPG - common files
 Summary(pl.UTF-8):     GnuPG - pliki wspólne
 Group:         Applications/File
-Requires:      libassuan >= 1:1.0.2
-Requires:      libgcrypt >= 1.2.2
-Requires:      libgpg-error >= 1.4
-Requires:      libksba >= 1.0.2
+Requires:      libassuan >= 1:2.0.0
+Requires:      libgcrypt >= 1.4.0
+Requires:      libgpg-error >= 1.7
+Requires:      libksba >= 1.0.7
 Conflicts:     gnupg-agent < 1.9.14-2
 
 %description common
@@ -79,6 +79,7 @@ Summary:      GnuPG 2 plugin for allow talk to a HTTP/FTP keyserver
 Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HTTP/FTP
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
+Requires:      curl-libs >= 7.10
 
 %description plugin-keys_curl
 GnuPG 2 plugin for allow talk to a HTTP(S)/FTP(S) keyserver.
@@ -191,12 +192,10 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %setup -q -n gnupg-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%{!?with_tests:%patch3 -p1}
+%{!?with_tests:%patch2 -p1}
+%patch3 -p1
 
-rm -f po/stamp-po
-
-sed -i -e 's#gl_AC_TYPE_LONG_LONG#AC_TYPE_LONG_LONG_INT#g' gl/m4/allocsa.m4
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -233,10 +232,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p      /sbin/postshell
+%post  -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p      /sbin/postshell
+%postun        -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2