SPECS: qmail.spec - set domainkeys dir to /etc/qmail/control/domai...

[glen]

Author: glen                         Date: Sat Jun 25 17:58:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- set domainkeys dir to /etc/qmail/control/domainkeys
- fix illegal usage of %{_sysconfdir} macro

---- Files affected:
SPECS:
   qmail.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.138 SPECS/qmail.spec:1.139
--- SPECS/qmail.spec:1.138	Sat Jun 25 19:52:00 2005
+++ SPECS/qmail.spec	Sat Jun 25 19:58:06 2005
@@ -204,6 +204,7 @@
 # qmail-queue replacement that signs and verifies DomainKeys signatures.
 Patch224:	http://www.qmail.org/qmail-1.03-dk-0.53.patch
 Patch225:	qmail-dkeys-shared.patch
+Patch226:	qmail-dkeys-config.patch
 
 URL:		http://www.qmail.org/
 BuildRequires:	groff
@@ -282,7 +283,7 @@
 - qmail-lint - examine the qmail configuration,
 - tarpit - tool to fight with SPAM,
 - TLS/SSL support. If you want to use it you must have certificate in
-  /etc/qmail/control/servercert.pem.
+  %{_sysconfdir}/qmail/control/servercert.pem.
 - QHPSI v%{qhpsi_ver} - The Qmail High Performance Scanner Interface
   http://www.fehcom.de/qmail/qmail.html
 
@@ -305,7 +306,7 @@
 - qmail-lint - sprawdza konfigurację qmail-a,
 - tarpit - kolejne narzędzie do walki ze SPAM-em,
 - Obsługa TLS/SSL. Jeśli chcesz tego używać musisz mieć certyfikat w
-  /etc/qmail/control/servercert.pem.
+  %{_sysconfdir}/qmail/control/servercert.pem.
 
 ======================================================================
 - *** Uwaga! Przeczytaj uważnie dokumentację do tego pakietu, ponieważ
@@ -453,6 +454,7 @@
 %if %{with dkeys}
 %patch224 -p1 -b .dk
 %patch225 -p1 -b .dk-shared
+%patch226 -p1 -b .dk-conf
 %endif
 
 mkdir -p qhpsi
@@ -541,7 +543,7 @@
 
 # RSA key generation cronjob
 install -d $RPM_BUILD_ROOT/etc/cron.hourly
-install qmail-genrsacert.sh $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
+install qmail-genrsacert.sh $RPM_BUILD_ROOT/etc/cron.hourly
 
 # for some files
 install -d $RPM_BUILD_ROOT/var/qmail/control/tlshosts
@@ -578,8 +580,8 @@
 cd ..
 
 # Set up mailing aliases
-install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/aliases
-ln -sf ../aliases $RPM_BUILD_ROOT%{_sysconfdir}/mail/aliases
+install %{SOURCE10} $RPM_BUILD_ROOT/etc/aliases
+ln -sf ../aliases $RPM_BUILD_ROOT/etc/mail/aliases
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/qmail/alias/.qmail-default
 %{?with_msglog:install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/qmail/alias/.qmail-msglog}
 
@@ -630,6 +632,7 @@
 %if %{with dkeys}
 install qmail-dk $RPM_BUILD_ROOT%{varqmail}/bin
 install qmail-dk.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/qmail/control/domainkeys
 %endif
 
 # default folder in /etc/skel
@@ -827,7 +830,7 @@
 
 %if %{with tls}
 # session cert
-%{_sysconfdir}/cron.hourly/qmail-genrsacert.sh
+/etc/cron.hourly/qmail-genrsacert.sh
 
 # server cert
 echo "Creating a self-signed ssl-certificate:"
@@ -949,7 +952,7 @@
 # QHPSI License requires all files to be distributed.
 %doc qhpsi
 
-%attr(755,root,root) %dir %{_sysconfdir}/mail
+%attr(755,root,root) %dir /etc/mail
 %attr(755,root,root) %dir %{_sysconfdir}/qmail
 %attr(2755,alias,nofiles) %dir %{_sysconfdir}/qmail/alias
 %attr(755,root,qmail) %dir %{_sysconfdir}/qmail/control
@@ -989,8 +992,8 @@
 %config(noreplace) %verify(not mtime) %{_sysconfdir}/qmail/control/conf-smtpd
 %config(noreplace) %verify(not mtime) %{_sysconfdir}/qmail/control/conf-rblsmtpd
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/qmail/users/*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/aliases
-%{_sysconfdir}/mail/aliases
+%config(noreplace) %verify(not size mtime md5) /etc/aliases
+/etc/mail/aliases
 %config(noreplace) %verify(not mtime) /etc/logrotate.d/qmail
 %attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/profile.d/*
 %attr(754,root,root) /etc/rc.d/init.d/*
@@ -1049,6 +1052,7 @@
 %attr(755,root,root) %{_libdir}/qmail/setmaillist
 %if %{with dkeys}
 %attr(755,root,root) %{_libdir}/qmail/qmail-dk
+%dir %attr(751,qmaild,root) %{_sysconfdir}/qmail/control/domainkeys
 %endif
 %attr(755,root,root) %{varqmail}/rc
 
@@ -1057,7 +1061,7 @@
 
 %if %{with tls}
 %attr(755,root,root) %{_libdir}/qmail/mkservercert
-%attr(755,root,root) %{_sysconfdir}/cron.hourly/qmail-genrsacert.sh
+%attr(755,root,root) /etc/cron.hourly/qmail-genrsacert.sh
 %dir %{_sysconfdir}/qmail/control/tlshosts
 %endif
 
@@ -1157,7 +1161,7 @@
 %doc {BLURB*,README,SECURITY,THANKS,THOUGHTS,TODO,VERSION}
 %doc qmail-client.html
 
-%attr(755,root,root) %dir %{_sysconfdir}/mail
+%attr(755,root,root) %dir /etc/mail
 %attr(755,root,root) %dir %{_sysconfdir}/qmail
 %attr(755,root,root) %dir %{_sysconfdir}/qmail/control
 %attr(755,root,root) %dir %{_libdir}/qmail
@@ -1250,6 +1254,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2005/06/25 17:58:06  glen
+- set domainkeys dir to /etc/qmail/control/domainkeys
+- fix illegal usage of %{_sysconfdir} macro
+
 Revision 1.138  2005/06/25 17:52:00  glen
 - fix dkeys shared patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qmail.spec?r1=1.138&r2=1.139&f=u