Change key directory to /etc/bacula/pubkeys

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3307 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/contrib-rpm/rpmkey.spec b/bacula/platforms/contrib-rpm/rpmkey.spec
index 52daff78c4746c75613bbb43a6a5ae9323c331ae..3dd41f9d159d5da8888a09914b4f528db51e81e6 100644 (file)
--- a/bacula/platforms/contrib-rpm/rpmkey.spec
+++ b/bacula/platforms/contrib-rpm/rpmkey.spec
@@ -20,13 +20,15 @@ Source0: %{pubkeyname}.asc
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-root
 
+%define gpgkeypath /etc/bacula/pubkeys
+
 %description
 The %{pubkeyname} rpm public key. If you trust %{pubkeyname} component
 and you want to import this key to the RPM database, then install this 
 RPM. After installing this package you may import the key into your rpm
 database, as root:
 
-rpm --import %{_libdir}/rpm/gnupg/%{pubkeyname}.asc
+rpm --import %{gpgkeypath}/%{pubkeyname}.asc
 
 %prep
 %setup -c -T a1
@@ -34,15 +36,17 @@ rpm --import %{_libdir}/rpm/gnupg/%{pubkeyname}.asc
 %build
 
 %install
-mkdir -p %{buildroot}%{_libdir}/rpm/gnupg
-cp -a %{SOURCE0} %{buildroot}%{_libdir}/rpm/gnupg
+mkdir -p %{buildroot}%{gpgkeypath}
+cp -a %{SOURCE0} %{buildroot}%{gpgkeypath}/
 
 %files
 %defattr(-, root, root)
-%{_libdir}/rpm/gnupg/%{pubkeyname}.asc
+%{gpgkeypath}/%{pubkeyname}.asc
 
 
 %changelog
+* Sat Aug 19 2006 D. Scott Barninger <barninger@fairfieldcomputers.com
+- change key directory to /etc/bacula/pubkeys
 * Sun Jul 16 2006 D. Scott Barninger <barninger@fairfieldcomputers.com
 - initial spec file