From f197b41f2cbcb13aaaf176ade1412312a2b24c32 Mon Sep 17 00:00:00 2001
From: twittner <twittner@pld-linux.org>
Date: Tue, 7 Jun 2005 18:31:56 +0000
Subject: [PATCH] - gnupg-agent start scripts for console and X-Window mode has
 been released   in separate subpackages: gnupg-agent-profile_d and
 gnupg-agent-xinitrc   (bugs #5648), appropriate info about it is passed on to
 user via trigger   & banner macros. - rel. 2

Changed files:
    gnupg2.spec -> 1.32
---
 gnupg2.spec | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/gnupg2.spec b/gnupg2.spec
index 95e3368..557b540 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,13 +1,12 @@
 #
 # Conditional build:
-%bcond_without	xinitrc	# don't use xinitrc's directory
 %bcond_without	pth	# without pth-based based version of gnupg
 #
 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
 Name:		gnupg2
 Version:	1.9.16
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/File
 Source0:	ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -26,6 +25,7 @@ BuildRequires:	libksba-devel >= 0.9.11
 BuildRequires:	pcsc-lite-devel
 BuildRequires:	opensc-devel >= 0.8.0
 %{?with_pth:BuildRequires:	pth-devel >= 2.0.0}
+BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
 Requires:	gnupg2-common = %{version}-%{release}
@@ -69,7 +69,6 @@ Summary(pl):	Rozszerzenie GnuPG - agent
 Group:		Applications/File
 Requires:	gnupg2-common = %{version}-%{release}
 Requires:	pinentry
-%{?with_xinitrc:Requires: xinitrc}
 Obsoletes:	newpg
 
 %description -n gnupg-agent
@@ -78,6 +77,31 @@ GnuPG extension - agent.
 %description -n gnupg-agent -l pl
 Rozszerzenie GnuPG - agent.
 
+%package -n gnupg-agent-profile_d
+Summary:	gnupg-agent start script for text mode
+Summary(pl):	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
+Skrypt startowy gnupg-agenta dla trybu tekstowego.
+
+%package -n gnupg-agent-xinitrc
+Summary:	gnupg-agent start script for X-Window mode
+Summary(pl):	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
+Skrypt startowy gnupg-agenta dla trybu X-Window.
+
 %package -n gnupg-smime
 Summary:	GnuPG extension - S/MIME support
 Summary(pl):	Rozszerzenie GnuPG - obs³uga S/MIME
@@ -115,15 +139,13 @@ cp -f /usr/share/automake/config.* scripts
 
 %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}
 
-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 || :
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -139,6 +161,12 @@ rm -rf $RPM_BUILD_ROOT
 %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 
 %defattr(644,root,root,755)
 %doc g10-ChangeLog g10/options.skel
@@ -172,5 +200,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/gpg-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase
 %attr(755,root,root) %{_libexecdir}/pcsc-wrapper
+
+%files -n gnupg-agent-profile_d
+%defattr(644,root,root,755)
 %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
-- 
2.44.0