rpms/gnupg2/F-8 gnupg2.spec, 1.77, 1.78 gpg-agent-shutdown.sh, 1.2, NONE gpg-agent-startup.sh, 1.7, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gnupg2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276

Modified Files:
	gnupg2.spec 
Removed Files:
	gpg-agent-shutdown.sh gpg-agent-startup.sh 
Log Message:
* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-2
- avoid kde-filesystem dep (#427316)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-8/gnupg2.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnupg2.spec	21 Dec 2007 21:33:16 -0000	1.77
+++ gnupg2.spec	24 Jan 2008 03:41:03 -0000	1.78
@@ -1,16 +1,8 @@
 
-## Keep an eye on http://bugzilla.redhat.com/175744
-## in case these dirs go away or change
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
-%define kde_scriptdir %{_sysconfdir}/kde
-%else
-%define kde_scriptdir %{_prefix}
-%endif
-
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 2.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 Group:   Applications/System
@@ -19,10 +11,6 @@
 URL:     http://www.gnupg.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# enable auto-startup/shutdown of gpg-agent
-Source10: gpg-agent-startup.sh
-Source11: gpg-agent-shutdown.sh
-
 Patch1: gnupg-1.9.16-testverbose.patch
 
 BuildRequires: bzip2-devel
@@ -45,13 +33,7 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 Requires(hint): dirmngr
-# sed/kill used in gpg-agent-(startup/shutdown).sh
-Requires: fileutils util-linux
 Requires: pinentry
-%if 0%{?fedora} > 6
-# ownership of %{kde_scriptdir}
-Requires: kde-filesystem
-%endif
 
 # ancient, deprecated
 #Obsoletes: newpg < 0.9.5
@@ -116,11 +98,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# enable auto-startup/shutdown of gpg-agent 
-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}
 
 # file conflicts with gnupg-1.x 
@@ -170,8 +147,6 @@
 %{_libexecdir}/*
 %{_infodir}/*
 %{_mandir}/man?/*
-%{kde_scriptdir}/env/*.sh
-%{kde_scriptdir}/shutdown/*.sh
 
 
 %clean
@@ -179,6 +154,9 @@
 
 
 %changelog
+* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-2
+- avoid kde-filesystem dep (#427316)
+
 * Thu Dec 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.8-1
 - gnupg2-2.0.8
 


--- gpg-agent-shutdown.sh DELETED ---


--- gpg-agent-startup.sh DELETED ---