- avoid kde-filesystem dep (#427316)

This commit is contained in:
Rex Dieter 2008-01-24 03:18:26 +00:00
parent 09530947be
commit 98511d4b1a

View File

@ -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 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
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 @@ BuildRequires: zlib-devel
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
# ownership of %{kde_scriptdir}
%if 0%{?fedora} > 6
Requires: kde-filesystem
%endif
# ancient, deprecated
#Obsoletes: newpg < 0.9.5
@ -116,11 +98,6 @@ rm -rf $RPM_BUILD_ROOT
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 @@ fi
%{_libexecdir}/*
%{_infodir}/*
%{_mandir}/man?/*
%{kde_scriptdir}/env/*.sh
%{kde_scriptdir}/shutdown/*.sh
%clean
@ -179,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 23 2008 Rex Dieter <rdieter@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