- release 2

[packages/gnupg2.git] / gnupg2.spec

diff --git a/gnupg2.spec b/gnupg2.spec
index eef4dab320de16105991d02b79bc8c9aa3353243..2bcf143171b0cc38628be7c7ceff47783da9d1d8 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,29 +6,30 @@
 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.8
+Version:       2.0.11
 Release:       2
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: fc4377ca67e1bf687eeaf22e79c0b9d1
+# Source0-md5: a3014f3b3c919662278060f9a4818b89
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pth.patch
 Patch2:                %{name}-pl.po-update.patch
 Patch3:                %{name}-disable_tests.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.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
-BuildRequires: libusb-devel
-BuildRequires: openldap-devel >= 2.4.6
+BuildRequires: libusb-compat-devel
+BuildRequires: openldap-devel
 BuildRequires: pcsc-lite-devel
 %{?with_pth:BuildRequires:     pth-devel >= 2.0.0}
 BuildRequires: rpmbuild(macros) >= 1.177
@@ -110,6 +111,18 @@ GnuPG 2 plugin for allow talk to a HKP keyserver.
 %description plugin-keys_hkp -l pl.UTF-8
 Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP.
 
+%package plugin-keys_kdns
+Summary:       GnuPG 2 plugin for allow talk to a KDNS keyserver
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS
+Group:         Applications/File
+Requires:      %{name}-common = %{version}-%{release}
+
+%description plugin-keys_kdns
+GnuPG 2 plugin for allow talk to a KDNS keyserver.
+
+%description plugin-keys_kdns -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS.
+
 %package plugin-keys_ldap
 Summary:       GnuPG 2 plugin for allow talk to a LDAP keyserver
 Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP
@@ -127,7 +140,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
@@ -196,7 +209,7 @@ sed -i -e 's#gl_AC_TYPE_LONG_LONG#AC_TYPE_LONG_LONG_INT#g' gl/m4/allocsa.m4
        --enable-gpg \
        --enable-symcryptrun \
        --with-capabilities \
-       --with-pinentry-pgm=%{_bindir}/pinentry-curses \
+       --with-pinentry-pgm=%{_bindir}/pinentry \
        --with-mailprog=/usr/lib/sendmail
 
 %{__make}
@@ -212,7 +225,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
@@ -220,11 +233,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
@@ -260,7 +273,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)
@@ -274,6 +287,10 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
 
+%files plugin-keys_kdns
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_kdns
+
 %files plugin-keys_ldap
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gpg2keys_ldap