rpms/dirmngr/devel dirmngr.conf, 1.1, 1.2 dirmngr.logrotate, 1.1, 1.2 dirmngr.spec, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/dirmngr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262

Modified Files:
	dirmngr.conf dirmngr.logrotate dirmngr.spec 
Log Message:
* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.0-6
- /var/log/dirmngr.log -> /var/log/dirmngr/dirmngr.log
- remove use of %ghost (e.g. dirmngr.log shouldn't be owned)
- BR: gettext



Index: dirmngr.conf
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/dirmngr.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirmngr.conf	26 Jun 2006 19:04:29 -0000	1.1
+++ dirmngr.conf	3 Oct 2007 13:13:29 -0000	1.2
@@ -1,3 +1,3 @@
 ## /etc/dirmngr/dirmngr.conf
-log-file /var/log/dirmngr.log
+log-file /var/log/dirmngr/dirmngr.log
 #allow-ocsp


Index: dirmngr.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/dirmngr.logrotate,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dirmngr.logrotate	26 Jun 2006 19:04:29 -0000	1.1
+++ dirmngr.logrotate	3 Oct 2007 13:13:29 -0000	1.2
@@ -1,4 +1,4 @@
-/var/log/dirmngr.log {
+/var/log/dirmngr/dirmngr.log {
     weekly
     notifempty
     missingok


Index: dirmngr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dirmngr/devel/dirmngr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dirmngr.spec	26 Aug 2007 17:32:33 -0000	1.10
+++ dirmngr.spec	3 Oct 2007 13:13:29 -0000	1.11
@@ -4,7 +4,7 @@
 Name:	 dirmngr 
 Summary: Client for Managing/Downloading CRLs
 Version: 1.0.0
-Release: 5%{?dist} 
+Release: 6%{?dist} 
 
 License: GPLv2+
 Group:	 System Environment/Libraries
@@ -18,6 +18,7 @@
 Source12: dirmngr.logrotate
 
 BuildRequires: gawk
+BuildRequires: gettext
 BuildRequires: libassuan-devel
 BuildRequires: libgcrypt-devel >= 1.2.0
 BuildRequires: libksba-devel >= 1.0.0 
@@ -55,32 +56,27 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf %{buildroot} 
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dirmngr/trusted-certs
-# x86_64?  lib -> %{_lib} ?
-mkdir -p $RPM_BUILD_ROOT%{_var}/lib/dirmngr/extra-certs
+# dirs
+mkdir -p %{buildroot}%{_sysconfdir}/dirmngr/trusted-certs
+mkdir -p %{buildroot}%{_var}/cache/dirmngr/crls.d
+mkdir -p %{buildroot}%{_var}/lib/dirmngr/extra-certs
+mkdir -p %{buildroot}%{_var}/log/dirmngr
+mkdir -p %{buildroot}%{_var}/run/dirmngr
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-# conf files
-install -p -m644 %{SOURCE10} %{SOURCE11} \
-  $RPM_BUILD_ROOT%{_sysconfdir}/dirmngr/
-
-# logrotate
-install -p -m644 -D %{SOURCE12} \
-  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/dirmngr
+# dirmngr.log, logrotate
+install -p -m644 -D %{SOURCE12} %{buildroot}%{_sysconfdir}/logrotate.d/dirmngr
 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+# conf files
+install -p -m644 %{SOURCE10} %{SOURCE11} %{buildroot}%{_sysconfdir}/dirmngr/
 
 %find_lang %{name}
 
-# files/dirs for --daemon mode
-mkdir -p $RPM_BUILD_ROOT%{_var}/cache/dirmngr/crls.d/
-touch $RPM_BUILD_ROOT%{_var}/cache/dirmngr/crls.d/DIR.txt
-mkdir -p $RPM_BUILD_ROOT%{_var}/log/
-touch $RPM_BUILD_ROOT%{_var}/log/dirmngr.log
-mkdir -p $RPM_BUILD_ROOT%{_var}/run/dirmngr
+## unpackaged files
+rm -f %{buildroot}%{_infodir}/dir
 
 
 %post
@@ -93,11 +89,11 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT 
+rm -rf %{buildroot} 
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING README ChangeLog NEWS
 %{_bindir}/dirmngr*
 %{_libexecdir}/dirmngr_ldap
@@ -105,19 +101,22 @@
 %{_mandir}/man1/*
 # TODO/FIXME
 #{_initrddir}/*
-# files/dirs for --daemon mode
+## files/dirs for --daemon mode
 %dir %{_sysconfdir}/dirmngr
 %config(noreplace) %{_sysconfdir}/dirmngr/*.conf
 %config %{_sysconfdir}/logrotate.d/*
-%dir %{_var}/cache/dirmngr
-%dir %{_var}/cache/dirmngr/crls.d
-%ghost %{_var}/cache/dirmngr/crls.d/DIR.txt
-%{_var}/lib/dirmngr
-%ghost %{_var}/log/dirmngr.log
-%{_var}/run/dirmngr
+%{_var}/cache/dirmngr/
+%{_var}/lib/dirmngr/
+%{_var}/log/dirmngr/
+%{_var}/run/dirmngr/
 
 
 %changelog
+* Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.0-6
+- /var/log/dirmngr.log -> /var/log/dirmngr/dirmngr.log
+- remove use of %%ghost (e.g. dirmngr.log shouldn't be owned)
+- BR: gettext
+
 * Sun Aug 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.0-5
 - BR: gawk