[mgetty/f19] spec: change naming scheme for log files

[Michal Sekletar]

commit 96e6daa5dda4d1961a992d209492e01617157ec7
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Wed Feb 20 18:21:23 2013 +0100

    spec: change naming scheme for log files

 logrotate.mgetty           |    4 +---
 logrotate.vgetty           |    4 +---
 mgetty-1.1.26-policy.patch |    4 ++--
 mgetty.spec                |   10 ++++++++++
 4 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/logrotate.mgetty b/logrotate.mgetty
index 5342040..d72490b 100644
--- a/logrotate.mgetty
+++ b/logrotate.mgetty
@@ -1,9 +1,7 @@
 #
 # Rotate mgetty log files.
 #
-
-tabooext + mgetty.log.tty*[-.]*
-/var/log/mgetty.log.tty* /var/log/mgetty.log.unknown /var/log/mgetty.log.callback {
+/var/log/mgetty.tty*.log /var/log/mgetty.unknown.log /var/log/mgetty.callback.log {
 	nocompress
 	missingok
 }
diff --git a/logrotate.vgetty b/logrotate.vgetty
index 5740e7f..b9dc6fc 100644
--- a/logrotate.vgetty
+++ b/logrotate.vgetty
@@ -1,9 +1,7 @@
 #
 # Entry for rotating vgetty log files.
 #
-
-tabooext + vgetty.log.tty*[-.]*
-/var/log/vgetty.log.tty /var/log/vgetty.log.unknown /var/log/vgetty.callback {
+/var/log/vgetty.tty*.log /var/log/vgetty.unknown.log /var/log/vgetty.callback.log {
 	nocompress
 	missingok
 }
diff --git a/mgetty-1.1.26-policy.patch b/mgetty-1.1.26-policy.patch
index 6478cf5..8a3ef7e 100644
--- a/mgetty-1.1.26-policy.patch
+++ b/mgetty-1.1.26-policy.patch
@@ -24,7 +24,7 @@ diff -up mgetty-1.1.36/policy.h.policy mgetty-1.1.36/policy.h
   * if the directory does not exist, the log file goes to CONSOLE (!)
   */
 -#define LOG_PATH "/var/log/mgetty.%s"
-+#define LOG_PATH "/var/log/mgetty.log.%s"
++#define LOG_PATH "/var/log/mgetty.%s.log"
  
  /* Default log error level threshold. Possible error levels are
   * L_FATAL, L_ERROR, L_AUDIT, L_WARN, L_MESG, L_NOISE, L_JUNK (see mgetty.h)
@@ -102,7 +102,7 @@ diff -up mgetty-1.1.36/voice/include/paths.h.policy mgetty-1.1.36/voice/include/
   */
  
 -#define VGETTY_LOG_PATH "/var/log/vgetty.%s"
-+#define VGETTY_LOG_PATH "/var/log/vgetty.log.%s"
++#define VGETTY_LOG_PATH "/var/log/vgetty.%s.log"
  
  /*
   * Filename of the logfile for vm.
diff --git a/mgetty.spec b/mgetty.spec
index 3fd4711..906773d 100644
--- a/mgetty.spec
+++ b/mgetty.spec
@@ -48,6 +48,7 @@ BuildRequires: libX11-devel, libXext-devel, texinfo-tex, texlive-dvips
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
 Requires: /usr/sbin/sendmail
+Conflicts: hylafax+
 URL: http://mgetty.greenie.net/
 
 %package sendfax
@@ -360,6 +361,15 @@ fi
 %{_mandir}/man1/viewfax.1*
 
 %changelog
+* Tue Feb 19 2013 Michal Sekletar <msekleta at redhat.com> - 1.1.36-17
+- Resolve : #850206 #752435
+- Change naming scheme for log files
+- Change configuration for logrotate
+- Fix rpm scriptlets
+- Fix installation of a unit file template
+- Fix manpage, explains how to use newly added systemd capabilities
+- Add conflict with hylafax+
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.36-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild