- updated to 2.0.18

[packages/gnupg2.git] / gnupg2.spec

diff --git a/gnupg2.spec b/gnupg2.spec
index 44dda164e1d46618a546897911504d19f6915105..b833dcb8d765b8be5df76267c4e5e84cc96c2c7a 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -3,37 +3,39 @@
 %bcond_without pth     # without pth-based based version of gnupg
 %bcond_without tests   # testsuite on build
 #
 %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
 Name:          gnupg2

-Version:       2.0.2
-Release:       0.1
-License:       GPL
+Version:       2.0.18
+Release:       1
+License:       GPL v3+

 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2

-# Source0-md5: 9f972c78135a7dea1bae66bb9f263980
+# Source0-md5: 2f37e0722666a0fedbe4d9f9227ac4d7

 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pth.patch
 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/
 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.10

 BuildRequires: bzip2-devel
 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.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
 %{?with_pth:BuildRequires:     pth-devel >= 2.0.0}
 BuildRequires: rpmbuild(macros) >= 1.177
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 BuildRequires: openldap-devel
 BuildRequires: pcsc-lite-devel
 %{?with_pth:BuildRequires:     pth-devel >= 2.0.0}
 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)
 
 Requires:      gnupg2-common = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -45,7 +47,7 @@ be used to encrypt data and to create digital signatures. It includes
 an advanced key management facility and is compliant with the proposed
 OpenPGP Internet standard as described in RFC2440.
 
 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
 
 %description -l pl.UTF-8
 GnuPG (GNU Privacy Guard) jest narzędziem do bezpiecznej komunikacji i


@@ -54,14 +56,16 @@ oraz podpisywania danych. Umożliwia zaawansowane zarządzanie kluczami
 i spełnia normy zdefiniowane w standardzie OpenPGP, który jest opisany
 w RFC2440.
 
 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
 
 %package common
 Summary:       GnuPG - common files

-Summary(pl.UTF-8):   GnuPG - pliki wspólne
+Summary(pl.UTF-8):     GnuPG - pliki wspólne

 Group:         Applications/File
 Group:         Applications/File

-Requires:      libassuan >= 1:0.9.3
-Requires:      libgpg-error >= 1.4
+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
 Conflicts:     gnupg-agent < 1.9.14-2
 
 %description common


@@ -72,9 +76,10 @@ Pliki wspólne używane przez różne narzędzia z projektu GnuPG.
 
 %package plugin-keys_curl
 Summary:       GnuPG 2 plugin for allow talk to a HTTP/FTP keyserver
 
 %package plugin-keys_curl
 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
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HTTP/FTP

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 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.
 
 %description plugin-keys_curl
 GnuPG 2 plugin for allow talk to a HTTP(S)/FTP(S) keyserver.


@@ -85,7 +90,7 @@ HTTP(S)/FTP(S).
 
 %package plugin-keys_finger
 Summary:       GnuPG 2 plugin for allow talk to a FINGER keyserver
 
 %package plugin-keys_finger
 Summary:       GnuPG 2 plugin for allow talk to a FINGER keyserver

-Summary(pl.UTF-8):   Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy FINGER
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy FINGER

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 


@@ -97,7 +102,7 @@ Wtyczka 2 GnuPG pozwalająca komunikować się z serwerem kluczy FINGER.
 
 %package plugin-keys_hkp
 Summary:       GnuPG 2 plugin for allow talk to a HKP keyserver
 
 %package plugin-keys_hkp
 Summary:       GnuPG 2 plugin for allow talk to a HKP keyserver

-Summary(pl.UTF-8):   Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 


@@ -107,9 +112,21 @@ 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.
 
 %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
 %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
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 


@@ -121,10 +138,10 @@ Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP.
 
 %package -n gnupg-agent
 Summary:       GnuPG extension - agent
 
 %package -n gnupg-agent
 Summary:       GnuPG extension - agent

-Summary(pl.UTF-8):   Rozszerzenie GnuPG - agent
+Summary(pl.UTF-8):     Rozszerzenie GnuPG - agent

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}

-Requires:      pinentry
+Requires:      pinentry >= 0.7.5-2

 Obsoletes:     newpg
 
 %description -n gnupg-agent
 Obsoletes:     newpg
 
 %description -n gnupg-agent


@@ -135,7 +152,7 @@ Rozszerzenie GnuPG - agent.
 
 %package -n gnupg-agent-profile_d
 Summary:       gnupg-agent start script for text mode
 
 %package -n gnupg-agent-profile_d
 Summary:       gnupg-agent start script for text mode

-Summary(pl.UTF-8):   Skrypt startowy gnupg-agenta dla trybu tekstowego
+Summary(pl.UTF-8):     Skrypt startowy gnupg-agenta dla trybu tekstowego

 Group:         Applications/File
 Requires:      gnupg-agent = %{version}-%{release}
 
 Group:         Applications/File
 Requires:      gnupg-agent = %{version}-%{release}
 


@@ -147,7 +164,7 @@ Skrypt startowy gnupg-agenta dla trybu tekstowego.
 
 %package -n gnupg-agent-xinitrc
 Summary:       gnupg-agent start script for X-Window mode
 
 %package -n gnupg-agent-xinitrc
 Summary:       gnupg-agent start script for X-Window mode

-Summary(pl.UTF-8):   Skrypt startowy gnupg-agenta dla trybu X-Window
+Summary(pl.UTF-8):     Skrypt startowy gnupg-agenta dla trybu X-Window

 Group:         Applications/File
 Requires:      gnupg-agent = %{version}-%{release}
 Requires:      xinitrc
 Group:         Applications/File
 Requires:      gnupg-agent = %{version}-%{release}
 Requires:      xinitrc


@@ -160,7 +177,7 @@ Skrypt startowy gnupg-agenta dla trybu X-Window.
 
 %package -n gnupg-smime
 Summary:       GnuPG extension - S/MIME support
 
 %package -n gnupg-smime
 Summary:       GnuPG extension - S/MIME support

-Summary(pl.UTF-8):   Rozszerzenie GnuPG - obsługa S/MIME
+Summary(pl.UTF-8):     Rozszerzenie GnuPG - obsługa S/MIME

 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 Conflicts:     gnupg-agent < 1.9.14-2
 Group:         Applications/File
 Requires:      %{name}-common = %{version}-%{release}
 Conflicts:     gnupg-agent < 1.9.14-2


@@ -175,10 +192,10 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %setup -q -n gnupg-%{version}
 %patch0 -p1
 %patch1 -p1
 %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
+%{__rm} po/stamp-po

 
 %build
 %{__gettextize}
 
 %build
 %{__gettextize}


@@ -191,6 +208,7 @@ rm -f po/stamp-po
        --enable-gpg \
        --enable-symcryptrun \
        --with-capabilities \
        --enable-gpg \
        --enable-symcryptrun \
        --with-capabilities \

+       --with-pinentry-pgm=%{_bindir}/pinentry \

        --with-mailprog=/usr/lib/sendmail
 
 %{__make}
        --with-mailprog=/usr/lib/sendmail
 
 %{__make}


@@ -206,7 +224,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 || :
 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
 
 %find_lang gnupg2
 rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir


@@ -214,11 +232,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
 
 %triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2
 %banner gnupg-agent-1.9.16-2 << EOF


@@ -237,7 +255,7 @@ EOF
 %files common -f gnupg2.lang
 %defattr(644,root,root,755)
 %doc AUTHORS main-ChangeLog NEWS README THANKS TODO
 %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}/gpg-connect-agent
 %attr(755,root,root) %{_bindir}/gpgconf
 %attr(755,root,root) %{_bindir}/gpgkey2ssh


@@ -245,6 +263,7 @@ EOF
 %attr(755,root,root) %{_bindir}/kbxutil
 %attr(755,root,root) %{_bindir}/watchgnupg
 %attr(755,root,root) %{_sbindir}/addgnupghome
 %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*
 %dir %{_libexecdir}
 %{_datadir}/gnupg
 %{_mandir}/man1/gpg-connect-agent.1*


@@ -252,7 +271,8 @@ EOF
 %{_mandir}/man1/gpgparsemail.1*
 %{_mandir}/man1/watchgnupg.1*
 %{_mandir}/man8/addgnupghome.8*
 %{_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)
 
 %files plugin-keys_curl
 %defattr(644,root,root,755)


@@ -266,6 +286,10 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
 
 %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 plugin-keys_ldap
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gpg2keys_ldap


@@ -285,6 +309,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) %{_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*
 %attr(755,root,root) %{_libexecdir}/gpg-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
 %{_mandir}/man1/gpg-agent.1*