backend/logrotate/spacewalk-backend-app | 1 +
backend/logrotate/spacewalk-backend-applet | 1 +
backend/logrotate/spacewalk-backend-config-files | 1 +
backend/logrotate/spacewalk-backend-config-files-tool | 1 +
backend/logrotate/spacewalk-backend-iss | 1 +
backend/logrotate/spacewalk-backend-iss-export | 1 +
backend/logrotate/spacewalk-backend-package-push-server | 1 +
backend/logrotate/spacewalk-backend-server | 1 +
backend/logrotate/spacewalk-backend-tools | 1 +
backend/logrotate/spacewalk-backend-xmlrpc | 1 +
backend/spacewalk-backend.spec | 10 +++++++++-
client/tools/osad/osad.spec | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
13 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 599ef9f98b25775ce401cbdcc6bc5b8ef197f37c
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Feb 6 17:31:56 2014 +0100
Automatic commit of package [spacewalk-backend] release [2.1.49-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8d5d70e..46348ae 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.48
+Version: 2.1.49
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -632,6 +632,10 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Thu Feb 06 2014 Jan Dobes 2.1.49-1
+- 1056515 - adapting to different logrotate version in fedora and rhel
+- 870990 - sw-rm-ch -l when satellite-sync runs.
+
* Wed Feb 05 2014 Aron Parsons <parsonsa(a)bit-sys.com> 2.1.48-1
- apply exclude filters to dependencies in repo-sync
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a7d5481..544cca2 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.48-1 backend/
+2.1.49-1 backend/
commit 66509c2cb11dfd6f68208f13d904cdafc68a79d6
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Feb 6 14:12:44 2014 +0100
1056515 - adapting to different logrotate version in fedora and rhel
according to ca3160e9d397c07361a44701000b3dfb51480429
diff --git a/backend/logrotate/spacewalk-backend-app
b/backend/logrotate/spacewalk-backend-app
index 17235c5..4f584c5 100644
--- a/backend/logrotate/spacewalk-backend-app
+++ b/backend/logrotate/spacewalk-backend-app
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-applet
b/backend/logrotate/spacewalk-backend-applet
index 99dcbef..565e3e9 100644
--- a/backend/logrotate/spacewalk-backend-applet
+++ b/backend/logrotate/spacewalk-backend-applet
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-config-files
b/backend/logrotate/spacewalk-backend-config-files
index 8215185..cca73b8 100644
--- a/backend/logrotate/spacewalk-backend-config-files
+++ b/backend/logrotate/spacewalk-backend-config-files
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-config-files-tool
b/backend/logrotate/spacewalk-backend-config-files-tool
index 395fe92..45ae709 100644
--- a/backend/logrotate/spacewalk-backend-config-files-tool
+++ b/backend/logrotate/spacewalk-backend-config-files-tool
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-iss
b/backend/logrotate/spacewalk-backend-iss
index 99f5ca6..b423011 100644
--- a/backend/logrotate/spacewalk-backend-iss
+++ b/backend/logrotate/spacewalk-backend-iss
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-iss-export
b/backend/logrotate/spacewalk-backend-iss-export
index 498ac64..d9c8057 100644
--- a/backend/logrotate/spacewalk-backend-iss-export
+++ b/backend/logrotate/spacewalk-backend-iss-export
@@ -8,4 +8,5 @@
compress
notifempty
missingok
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-package-push-server
b/backend/logrotate/spacewalk-backend-package-push-server
index 6817fe4..5dd22e1 100644
--- a/backend/logrotate/spacewalk-backend-package-push-server
+++ b/backend/logrotate/spacewalk-backend-package-push-server
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-server
b/backend/logrotate/spacewalk-backend-server
index f85063d..2b45d4b 100644
--- a/backend/logrotate/spacewalk-backend-server
+++ b/backend/logrotate/spacewalk-backend-server
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/logrotate/spacewalk-backend-tools
b/backend/logrotate/spacewalk-backend-tools
index 4d90f06..ec5933d 100644
--- a/backend/logrotate/spacewalk-backend-tools
+++ b/backend/logrotate/spacewalk-backend-tools
@@ -9,6 +9,7 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
/var/log/rhn/reposync/*.log {
diff --git a/backend/logrotate/spacewalk-backend-xmlrpc
b/backend/logrotate/spacewalk-backend-xmlrpc
index 072acbc..77618c7 100644
--- a/backend/logrotate/spacewalk-backend-xmlrpc
+++ b/backend/logrotate/spacewalk-backend-xmlrpc
@@ -9,4 +9,5 @@
notifempty
missingok
size=10M
+#LOGROTATE-3.8# su root apache
}
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3715c99..8d5d70e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -279,6 +279,10 @@ export PYTHON_MODULE_VERSION=%{version}
%find_lang %{name}-server
+%if 0%{?fedora} || 0%{?rhel} > 6
+sed -i 's/#LOGROTATE-3.8#//'
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/spacewalk-backend-*
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index c67dc7c..a2ac5c4 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -162,7 +162,7 @@ mkdir -p %{buildroot}%{_var}/log/rhn
touch %{buildroot}%{_var}/log/osad
touch %{buildroot}%{_var}/log/rhn/osa-dispatcher.log
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 6
sed -i 's/#LOGROTATE-3.8#//'
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/osa-dispatcher
%endif