- updated to 2.0.18

[packages/gnupg2.git] / gnupg2.spec

diff --git a/gnupg2.spec b/gnupg2.spec
index b307cda2ad31685ec019a458eb6b17b1fb9a98f3..b833dcb8d765b8be5df76267c4e5e84cc96c2c7a 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,32 +1,41 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without xinitrc # don't use xinitrc's directory

 %bcond_without pth     # without pth-based based version of gnupg
 %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):   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:       1.9.14
-Release:       2
-License:       GPL
+Version:       2.0.18
+Release:       1
+License:       GPL v3+

 Group:         Applications/File
 Group:         Applications/File

-Source0:       ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.gz
-# Source0-md5: 72b56586392c7be6668df4ef8ea7c879
+Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+# Source0-md5: 2f37e0722666a0fedbe4d9f9227ac4d7

 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch

-Icon:          gnupg.gif
+Patch1:                %{name}-pth.patch
+Patch2:                %{name}-disable_tests.patch
+Patch3:                %{name}-pl.po-update.patch

 URL:           http://www.gnupg.org/
 URL:           http://www.gnupg.org/

-BuildRequires: automake
-BuildRequires: gettext-devel >= 0.12.1
-BuildRequires: libassuan-devel >= 1:0.6.9
-BuildRequires: libgcrypt-devel >= 1.1.93
-BuildRequires: libgpg-error-devel >= 0.6
-BuildRequires: libksba-devel >= 0.9.7
+BuildRequires: adns-devel
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.10
+BuildRequires: bzip2-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
 BuildRequires: pcsc-lite-devel

-BuildRequires: opensc-devel >= 0.8.0
-BuildRequires: pth-devel >= 2.0.0
+%{?with_pth:BuildRequires:     pth-devel >= 2.0.0}
+BuildRequires: rpmbuild(macros) >= 1.177

 BuildRequires: texinfo
 BuildRequires: zlib-devel
 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)
 


@@ -38,134 +47,280 @@ 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
-GnuPG (GNU Privacy Guard) jest narzêdziem do bezpiecznej komunikacji i
-bezpiecznego przechowywania danych. Mo¿e byæ u¿ywany do szyfrowania
-oraz podpisywania danych. Umo¿liwia zaawansowane zarz±dzanie kluczami
-i spe³nia normy zdefiniowane w standardzie OpenPGP, który jest opisany
+%description -l pl.UTF-8
+GnuPG (GNU Privacy Guard) jest narzędziem do bezpiecznej komunikacji i
+bezpiecznego przechowywania danych. Może być używany do szyfrowania
+oraz podpisywania danych. Umożliwia zaawansowane zarządzanie kluczami
+i spełnia normy zdefiniowane w standardzie OpenPGP, który jest opisany

 w RFC2440.
 
 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):   GnuPG - pliki wspólne 
+Summary(pl.UTF-8):     GnuPG - pliki wspólne

 Group:         Applications/File
 Group:         Applications/File

+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
 Common files used by tools from GnuPG project.
 
 Conflicts:     gnupg-agent < 1.9.14-2
 
 %description common
 Common files used by tools from GnuPG project.
 

-%description common -l pl
-Pliki wspólne u¿ywane przez ró¿ne narzêdzia z projektu GnuPG.
+%description common -l pl.UTF-8
+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
+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.
+
+%description plugin-keys_curl -l pl.UTF-8
+Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy
+HTTP(S)/FTP(S).
+
+%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
+Group:         Applications/File
+Requires:      %{name}-common = %{version}-%{release}
+
+%description plugin-keys_finger
+GnuPG 2 plugin for allow talk to a FINGER keyserver.
+
+%description plugin-keys_finger -l pl.UTF-8
+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
+Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP
+Group:         Applications/File
+Requires:      %{name}-common = %{version}-%{release}
+
+%description plugin-keys_hkp
+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
+Group:         Applications/File
+Requires:      %{name}-common = %{version}-%{release}
+
+%description plugin-keys_ldap
+GnuPG 2 plugin for allow talk to a LDAP keyserver.
+
+%description plugin-keys_ldap -l pl.UTF-8
+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):   Rozszerzenie GnuPG - agent
+Summary(pl.UTF-8):     Rozszerzenie GnuPG - agent

 Group:         Applications/File
 Group:         Applications/File

-Requires:      gnupg2-common = %{version}-%{release}
-Requires:      pinentry
-%{?with_xinitrc:Requires: xinitrc}
+Requires:      %{name}-common = %{version}-%{release}
+Requires:      pinentry >= 0.7.5-2

 Obsoletes:     newpg
 
 %description -n gnupg-agent
 GnuPG extension - agent.
 
 Obsoletes:     newpg
 
 %description -n gnupg-agent
 GnuPG extension - agent.
 

-%description -n gnupg-agent -l pl
+%description -n gnupg-agent -l pl.UTF-8

 Rozszerzenie GnuPG - agent.
 
 Rozszerzenie GnuPG - agent.
 

+%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
+Group:         Applications/File
+Requires:      gnupg-agent = %{version}-%{release}
+
+%description -n gnupg-agent-profile_d
+gnupg-agent start script for text mode.
+
+%description -n gnupg-agent-profile_d -l pl.UTF-8
+Skrypt startowy gnupg-agenta dla trybu tekstowego.
+
+%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
+Group:         Applications/File
+Requires:      gnupg-agent = %{version}-%{release}
+Requires:      xinitrc
+
+%description -n gnupg-agent-xinitrc
+gnupg-agent start script for X-Window mode.
+
+%description -n gnupg-agent-xinitrc -l pl.UTF-8
+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):   Rozszerzenie GnuPG - obs³uga S/MIME
+Summary(pl.UTF-8):     Rozszerzenie GnuPG - obsługa S/MIME

 Group:         Applications/File
 Group:         Applications/File

-Requires:      gnupg2-common = %{version}-%{release}
+Requires:      %{name}-common = %{version}-%{release}

 Conflicts:     gnupg-agent < 1.9.14-2
 
 %description -n gnupg-smime
 GnuPG extension - S/MIME support.
 
 Conflicts:     gnupg-agent < 1.9.14-2
 
 %description -n gnupg-smime
 GnuPG extension - S/MIME support.
 

-%description -n gnupg-smime -l pl
-Rozszerzenie GnuPG - obs³uga S/MIME.
+%description -n gnupg-smime -l pl.UTF-8
+Rozszerzenie GnuPG - obsługa S/MIME.

 
 %prep
 %setup -q -n gnupg-%{version}
 %patch0 -p1
 
 %prep
 %setup -q -n gnupg-%{version}
 %patch0 -p1

+%patch1 -p1
+%{!?with_tests:%patch2 -p1}
+%patch3 -p1
+
+%{__rm} po/stamp-po

 
 %build
 
 %build

-cp -f /usr/share/automake/config.* scripts
+%{__gettextize}
+%{__aclocal} -I m4 -I gl/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}

 %configure \
 %configure \

-       --with-capabilities \

        %{!?with_pth:--disable-threads} \
        %{!?with_pth:--disable-threads} \

-%ifarch sparc sparc64
-       --disable-m-guard \
-%else
-       --enable-m-guard \
-%endif
-       --without-included-gettext \
-       --disable-m-debug \
+       --enable-gpg \
+       --enable-symcryptrun \
+       --with-capabilities \
+       --with-pinentry-pgm=%{_bindir}/pinentry \

        --with-mailprog=/usr/lib/sendmail
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
        --with-mailprog=/usr/lib/sendmail
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT/etc/profile.d
-%{?with_xinitrc:install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkglibdir=%{_libexecdir}
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkglibdir=%{_libexecdir}
 

-install %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d/gnupg-agent.sh
-%{?with_xinitrc:ln -sf /etc/profile.d/gnupg-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gnupg-agent.sh}
+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 || :
 
 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
 
 %find_lang gnupg2

+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        -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
+%triggerpostun -n gnupg-agent -- gnupg-agent < 1.9.16-2
+%banner gnupg-agent-1.9.16-2 << EOF
+Scripts for starting gnupg-agent have been moved to separate
+subpackages: gnupg-agent-profile_d and gnupg-agent-xinitrc.
+EOF

 
 

-%files 
+%files

 %defattr(644,root,root,755)
 %doc g10-ChangeLog g10/options.skel
 %attr(755,root,root) %{_bindir}/gpg2
 %attr(755,root,root) %{_bindir}/gpgv2
 %defattr(644,root,root,755)
 %doc g10-ChangeLog g10/options.skel
 %attr(755,root,root) %{_bindir}/gpg2
 %attr(755,root,root) %{_bindir}/gpgv2

+%{_mandir}/man1/gpg2.1*
+%{_mandir}/man1/gpgv2.1*

 
 %files common -f gnupg2.lang
 %defattr(644,root,root,755)
 
 %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 main-ChangeLog NEWS README THANKS TODO
+%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}/gpgconf

+%attr(755,root,root) %{_bindir}/gpgkey2ssh
+%attr(755,root,root) %{_bindir}/gpgparsemail
+%attr(755,root,root) %{_bindir}/kbxutil

 %attr(755,root,root) %{_bindir}/watchgnupg
 %attr(755,root,root) %{_sbindir}/addgnupghome
 %attr(755,root,root) %{_bindir}/watchgnupg
 %attr(755,root,root) %{_sbindir}/addgnupghome

-%attr(755,root,root) %{_bindir}/kbxutil
+%attr(755,root,root) %{_sbindir}/applygnupgdefaults
+%dir %{_libexecdir}

 %{_datadir}/gnupg
 %{_datadir}/gnupg

-%{_infodir}/*info*
+%{_mandir}/man1/gpg-connect-agent.1*
+%{_mandir}/man1/gpgconf.1*
+%{_mandir}/man1/gpgparsemail.1*
+%{_mandir}/man1/watchgnupg.1*
+%{_mandir}/man8/addgnupghome.8*
+%{_mandir}/man8/applygnupgdefaults.8*
+%{_infodir}/gnupg.info*
+
+%files plugin-keys_curl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_curl
+
+%files plugin-keys_finger
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gpg2keys_finger
+
+%files plugin-keys_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 -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
 
 %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*
+%{_mandir}/man1/gpgsm-gencert.sh.1*

 
 %files -n gnupg-agent
 %defattr(644,root,root,755)
 %doc agent-ChangeLog scd-ChangeLog
 %attr(755,root,root) %{_bindir}/gpg-agent
 
 %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}/sc-copykeys

 %attr(755,root,root) %{_bindir}/scdaemon
 %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-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase

-%attr(755,root,root) %{_libexecdir}/pcsc-wrapper
+%{_mandir}/man1/gpg-agent.1*
+%{_mandir}/man1/gpg-preset-passphrase.1*
+%{_mandir}/man1/scdaemon.1*
+%{_mandir}/man1/symcryptrun.1*
+
+%files -n gnupg-agent-profile_d
+%defattr(644,root,root,755)

 %attr(755,root,root) /etc/profile.d/gnupg-agent.sh
 %attr(755,root,root) /etc/profile.d/gnupg-agent.sh

-%{?with_xinitrc:%attr(755,root,root) /etc/X11/xinit/xinitrc.d/gnupg-agent.sh}
+
+%files -n gnupg-agent-xinitrc
+%defattr(644,root,root,755)
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/gnupg-agent.sh