commit bb52d368faea356171e83081f958f5d0e9da6711
Merge: 65db194 fc84043
Author: Nathanael d. Noblet <nathanael@xxxxxxx>
Date: Wed Sep 22 10:10:26 2010 -0600
Merge remote branch 'origin/master' into f13/master
Conflicts:
dspam.spec
dspam.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc dspam.spec
index 2847999,d6652d1..9872151
--- a/dspam.spec
+++ b/dspam.spec
@@@ -359,10 -359,10 +359,17 @@@ exit
%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
%changelog
++<<<<<<< HEAD
+* Tue Jul 13 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-7
+- Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
+
+* Wed Mar 3 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-6
++=======
+ * Tue Jul 13 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-8
+ - Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
+
+ * Wed Mar 3 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-7
++>>>>>>> origin/master
- Updated dspam initscript default start position to be after DBs
- reset initscript priorities
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
