rpms/gnupg2/devel gnupg2.spec,1.31,1.32

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102

Modified Files:
	gnupg2.spec 
Log Message:
* Thu Feb 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-2
- fc5+: use /etc/kde/(env|shutdown) for scripts (#175744)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnupg2.spec	10 Feb 2006 14:00:42 -0000	1.31
+++ gnupg2.spec	16 Feb 2006 19:50:31 -0000	1.32
@@ -4,10 +4,19 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
+
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
+%if "%{?fedora}" > "4"
+%define kde_scriptdir %{_sysconfdir}/kde
+%else
+%define kde_scriptdir %{_prefix}
+%define own_scriptdir 1
+%endif
+
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.20
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -105,10 +114,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
-# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
-install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
-install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
+mkdir -p $RPM_BUILD_ROOT%{kde_scriptdir}/{env,shutdown}
+install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{kde_scriptdir}/env/
+install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{kde_scriptdir}/shutdown/
 
 %find_lang %{name}
 
@@ -146,9 +154,13 @@
 %{_libdir}/gnupg/
 %{_libexecdir}/*
 %{_infodir}/*
-# Own dirs until someone else does (filesystem,kdebase?)
-%{_prefix}/env/
-%{_prefix}/shutdown/
+%if "%{?own_scriptdir}" == "1"
+%{kde_scriptdir}/env/
+%{kde_scriptdir}/shutdown/
+%else
+%{kde_scriptdir}/env/*.sh
+%{kde_scriptdir}/shutdown/*.sh
+%endif
 
 
 %clean
@@ -156,6 +168,9 @@
 
 
 %changelog
+* Thu Feb 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-2
+- fc5+: use /etc/kde/(env|shutdown) for scripts (#175744)
+
 * Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin