X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnupg2.spec;h=9c2a991422b5a3e83333b072dd7c1f35cc7d52ba;hb=9a524b95096f104ef0ea457d16068d560329fbc2;hp=54073622f4c0793c05d2425d309799a58de21ac5;hpb=f56b1d35b77d5efa2294831a0412b65b4b42de84;p=packages%2Fgnupg2.git

diff --git a/gnupg2.spec b/gnupg2.spec
index 5407362..9c2a991 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -6,28 +6,31 @@
 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.4
-Release:	1
-License:	GPL
+# 2.1.x is development version unfortunately (see gpg2 --version)
+Version:	2.1.16
+Release:	0.1
+License:	GPL v3+
 Group:		Applications/File
 Source0:	ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5:	e16efce067ba132f933792a3ec7f180e
+# Source0-md5:	bfb53004773a014d401694f94229fc00
 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
+Patch4:		%{name}-am.patch
 URL:		http://www.gnupg.org/
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9.3
+BuildRequires:	adns-devel
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.14
 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:	libgpg-error-devel >= 1.4
-BuildRequires:	libksba-devel >= 1.0.0
-BuildRequires:	libusb-devel
+BuildRequires:	curl-devel >= 7.10
+BuildRequires:	gettext-devel >= 0.19.3
+BuildRequires:	libassuan-devel >= 1:2.0.0
+BuildRequires:	libgcrypt-devel >= 1.5.0
+BuildRequires:	libgpg-error-devel >= 1.11
+BuildRequires:	libksba-devel >= 1.0.7
+BuildRequires:	libusb-compat-devel
 BuildRequires:	openldap-devel
 BuildRequires:	pcsc-lite-devel
 %{?with_pth:BuildRequires:	pth-devel >= 2.0.0}
@@ -35,6 +38,7 @@ BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
 Requires:	gnupg2-common = %{version}-%{release}
+Suggests:	gnupg-agent
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_libdir}/gnupg2
@@ -60,8 +64,10 @@ To jest wersja rozszerzona.
 Summary:	GnuPG - common files
 Summary(pl.UTF-8):	GnuPG - pliki wspólne
 Group:		Applications/File
-Requires:	libassuan >= 1:0.9.3
-Requires:	libgpg-error >= 1.4
+Requires:	libassuan >= 1:2.0.0
+Requires:	libgcrypt >= 1.5.0
+Requires:	libgpg-error >= 1.11
+Requires:	libksba >= 1.0.7
 Conflicts:	gnupg-agent < 1.9.14-2
 
 %description common
@@ -75,6 +81,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.
@@ -107,6 +114,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
@@ -124,7 +143,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
@@ -175,10 +194,11 @@ 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
+%patch4 -p1
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -191,6 +211,7 @@ rm -f po/stamp-po
 	--enable-gpg \
 	--enable-symcryptrun \
 	--with-capabilities \
+	--with-pinentry-pgm=%{_bindir}/pinentry \
 	--with-mailprog=/usr/lib/sendmail
 
 %{__make}
@@ -205,20 +226,17 @@ rm -rf $RPM_BUILD_ROOT
 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_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
@@ -228,7 +246,7 @@ EOF
 
 %files
 %defattr(644,root,root,755)
-%doc g10-ChangeLog g10/options.skel
+%doc g10/options.skel
 %attr(755,root,root) %{_bindir}/gpg2
 %attr(755,root,root) %{_bindir}/gpgv2
 %{_mandir}/man1/gpg2.1*
@@ -236,8 +254,7 @@ 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 AUTHORS ChangeLog ChangeLog-2011 NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/gpg-connect-agent
 %attr(755,root,root) %{_bindir}/gpgconf
 %attr(755,root,root) %{_bindir}/gpgkey2ssh
@@ -254,7 +271,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)
@@ -268,13 +285,16 @@ 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
 
 %files -n gnupg-smime
 %defattr(644,root,root,755)
-%doc sm-ChangeLog
 %attr(755,root,root) %{_bindir}/gpgsm
 %attr(755,root,root) %{_bindir}/gpgsm-gencert.sh
 %{_mandir}/man1/gpgsm.1*
@@ -282,13 +302,14 @@ EOF
 
 %files -n gnupg-agent
 %defattr(644,root,root,755)
-%doc agent-ChangeLog scd-ChangeLog
 %attr(755,root,root) %{_bindir}/gpg-agent
-%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
+%attr(755,root,root) %{_libexecdir}/gpg-wks-client
+%attr(755,root,root) %{_libexecdir}/scdaemon
 %{_mandir}/man1/gpg-agent.1*
 %{_mandir}/man1/gpg-preset-passphrase.1*
 %{_mandir}/man1/scdaemon.1*