X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnupg2.spec;h=916900576ceb24a496847e0f99a32971fdb2f52c;hb=e5ce2357c8395db29128c03ab152a008904d169d;hp=55e7fc3f557ac0d44a494771ea2491e51614cc2e;hpb=dc9f1abd5752655ec918ce6fe6d44643aeb80630;p=packages%2Fgnupg2.git

diff --git a/gnupg2.spec b/gnupg2.spec
index 55e7fc3..9169005 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,40 +1,48 @@
+# TODO: ntbtls instead of gnutls (when released)?
 #
 # Conditional build:
-%bcond_without	pth	# without pth-based based version of gnupg
 %bcond_without	tests	# testsuite on build
+%bcond_with	selinux	# "SELinux hacks"
 #
-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
-Version:	2.0.2
-Release:	1
-License:	GPL
+# 2.1.x is development version unfortunately (see gpg2 --version)
+Version:	2.1.0
+Release:	1.1
+License:	GPL v3+
 Group:		Applications/File
 Source0:	ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5:	9f972c78135a7dea1bae66bb9f263980
+# Source0-md5:	43a809789a1d897f4386680be0b09d02
 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.10
 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:	openldap-devel
-BuildRequires:	pcsc-lite-devel
-%{?with_pth:BuildRequires:	pth-devel >= 2.0.0}
+BuildRequires:	curl-devel >= 7.10
+BuildRequires:	gettext-tools >= 0.17
+BuildRequires:	gnutls-devel >= 3.0
+BuildRequires:	libassuan-devel >= 1:2.0.0
+BuildRequires:	libgcrypt-devel >= 1.6.0
+BuildRequires:	libgpg-error-devel >= 1.15
+BuildRequires:	libksba-devel >= 1.2.0
+BuildRequires:	libusb-compat-devel >= 0.1
+BuildRequires:	npth-devel >= 1.1
+# only for dirmngr, which is not built here
+#BuildRequires:	openldap-devel
+BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
 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
@@ -45,7 +53,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.
 
-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
@@ -54,14 +62,23 @@ oraz podpisywania danych. Umożliwia zaawansowane zarządzanie kluczami
 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
 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.6.0
+Requires:	libgpg-error >= 1.15
+Requires:	libksba >= 1.2.0
+Requires:	npth >= 1.1
+Obsoletes:	gnupg2-plugin-keys_curl
+Obsoletes:	gnupg2-plugin-keys_finger
+Obsoletes:	gnupg2-plugin-keys_hkp
+Obsoletes:	gnupg2-plugin-keys_kdns
+Obsoletes:	gnupg2-plugin-keys_ldap
+Conflicts:	gnupg < 1.4.18-2
 Conflicts:	gnupg-agent < 1.9.14-2
 
 %description common
@@ -70,61 +87,12 @@ Common files used by tools from GnuPG project.
 %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}
-
-%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_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
 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
@@ -174,11 +142,12 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %prep
 %setup -q -n gnupg-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%{!?with_tests:%patch3 -p1}
 
-rm -f po/stamp-po
+%{!?with_tests:%patch2 -p1}
+#%patch3 -p1
+%patch4 -p1
+
+%{__rm} po/stamp-po
 
 %build
 %{__gettextize}
@@ -187,10 +156,12 @@ rm -f po/stamp-po
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_pth:--disable-threads} \
+	--disable-dirmngr \
 	--enable-gpg \
+	%{?with_selinux:--enable-selinux-support} \
 	--enable-symcryptrun \
 	--with-capabilities \
+	--with-pinentry-pgm=%{_bindir}/pinentry \
 	--with-mailprog=/usr/lib/sendmail
 
 %{__make}
@@ -205,20 +176,23 @@ 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
+# non-existing program
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/gpg-zip.1
+# see dirmngr package
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{man1/dirmngr-client.1,man8/dirmngr.8}
+
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/info/dir
 
 %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 +202,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,43 +210,31 @@ 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 doc/{DETAILS,FAQ,KEYSERVER,OpenPGP}
+%attr(755,root,root) %{_bindir}/g13
 %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}/gpgparsemail
+%attr(755,root,root) %{_bindir}/gpgtar
 %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*
 %{_mandir}/man1/gpgconf.1*
 %{_mandir}/man1/gpgparsemail.1*
 %{_mandir}/man1/watchgnupg.1*
+%{_mandir}/man7/gnupg.7*
 %{_mandir}/man8/addgnupghome.8*
-%{_infodir}/*.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_ldap
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
+%{_mandir}/man8/applygnupgdefaults.8*
+%{_infodir}/gnupg.info*
 
 %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*
@@ -280,13 +242,12 @@ 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}/scdaemon
 %{_mandir}/man1/gpg-agent.1*
 %{_mandir}/man1/gpg-preset-passphrase.1*
 %{_mandir}/man1/scdaemon.1*