backend/satellite_tools/Makefile | 5
backend/satellite_tools/spacewalk-update-signatures | 145 +++++++++++++++++++
backend/satellite_tools/updateSignatures.py | 146 --------------------
backend/spacewalk-backend.spec | 78 ++++++++--
rel-eng/packages/spacewalk-backend | 2
5 files changed, 211 insertions(+), 165 deletions(-)
New commits:
commit dc5537d69af184cc76b8bfef2aa8f64bebafea6d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 15:48:13 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.28-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 47cd84a..763670d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.1.27
+Version: 1.1.28
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -680,6 +680,52 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jul 08 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.28-1
+- move %defattr before %doc (msuchy(a)redhat.com)
+- rename /usr/share/rhn/satellite_tools/updateSignatures.py to /usr/bin
+ /spacewalk-update-signatures (msuchy(a)redhat.com)
+- add epoch to Provides (msuchy(a)redhat.com)
+- logrotate scripts should have noreplace flag (msuchy(a)redhat.com)
+- forgot to save file after resolving conflict during rebase of
+ 7d48d4d7ab096551c7a53c7670c76ec83c441303 (msuchy(a)redhat.com)
+- wrap long lines (msuchy(a)redhat.com)
+- remove shebang from modules (msuchy(a)redhat.com)
+- fix spelling error (msuchy(a)redhat.com)
+- add logrotate entry for reposync.log (msuchy(a)redhat.com)
+- fix not standard dir permisions (msuchy(a)redhat.com)
+- fix Makefile - pack new renamed logrotate files (msuchy(a)redhat.com)
+- rename logrotate/rhn_server_satellite to logrotate/spacewalk-backend-tools
+ (msuchy(a)redhat.com)
+- rename logrotate/rhn_package_push to logrotate/spacewalk-backend-package-
+ push-server (msuchy(a)redhat.com)
+- rename logrotate/rhn_package_upload to logrotate/spacewalk-backend-upload-
+ server (msuchy(a)redhat.com)
+- rename logrotate/rhn_server to logrotate/spacewalk-backend-server
+ (msuchy(a)redhat.com)
+- rename logrotate/rhn_sat_export_internal to logrotate/spacewalk-backend-iss-
+ export (msuchy(a)redhat.com)
+- rename logrotate/rhn_server_sat to logrotate/spacewalk-backend-iss
+ (msuchy(a)redhat.com)
+- rename logrotate/rhn_config_management_tool to logrotate/spacewalk-backend-
+ config-files-tool (msuchy(a)redhat.com)
+- rename logrotate/rhn_config_management to logrotate/spacewalk-backend-config-
+ files (msuchy(a)redhat.com)
+- rename logrotate/rhn_server_applet to logrotate/spacewalk-backend-applet
+ (msuchy(a)redhat.com)
+- rename logrotate/rhn_server_app to logrotate/spacewalk-backend-app
+ (msuchy(a)redhat.com)
+- rename logrotate/rhn_server_xmlrpc to logrotate/spacewalk-backend-xmlrpc
+ (msuchy(a)redhat.com)
+- rename ./logrotate/rhn_server_xp to logrotate/spacewalk-backend-xp
+ (msuchy(a)redhat.com)
+- set default config files readable by all users (msuchy(a)redhat.com)
+- add to license PYTHON since we use compile.py (msuchy(a)redhat.com)
+- add licensing files to %doc (msuchy(a)redhat.com)
+- spelling error (msuchy(a)redhat.com)
+- make config files readable (msuchy(a)redhat.com)
+- 453457 - extract from package spacewalk-backend-sql new packages spacewalk-
+ backend-sql-oracle and spacewalk-backend-sql-postgresql (msuchy(a)redhat.com)
+
* Wed Jul 07 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.27-1
- 612163 - fixing issue with satellite sync where rh-public channel family
information is not set properly (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 35b82a5..c053921 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.27-1 backend/
+1.1.28-1 backend/
commit bf5027db3380e51ada30a21f14177add9f83b111
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 15:46:29 2010 +0200
move %defattr before %doc
addressing rpmlint warning:
spacewalk-backend.src:381: E: files-attr-not-set
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0b55937..47cd84a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -378,8 +378,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/rhnSQL/driver_cx_Oracle.py*
%files sql-postgresql
-%doc PYTHON-LICENSES.txt LICENSE
%defattr(-,root,root,-)
+%doc PYTHON-LICENSES.txt LICENSE
%{rhnroot}/server/rhnSQL/driver_postgresql.py*
%files server
commit 1d53680dcecdc7295c6d5ca9462f3f5edced0381
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 15:00:03 2010 +0200
rename /usr/share/rhn/satellite_tools/updateSignatures.py to
/usr/bin/spacewalk-update-signatures
addressing rpmlint error:
spacewalk-backend-tools.noarch: E: non-executable-script
/usr/share/rhn/satellite_tools/updateSignatures.py 0664L /usr/bin/python
diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile
index 4b61e1c..02c92a8 100644
--- a/backend/satellite_tools/Makefile
+++ b/backend/satellite_tools/Makefile
@@ -12,12 +12,13 @@ FILES = __init__ connection constants diskImportLib messages \
sync_handlers \
syncLib SequenceServer xmlDiskDumper xmlDiskSource \
xmlSource xmlWireSource rhn_satellite_activate rhn_ssl_dbstore \
- satComputePkgHeaders updatePackages reposync updateSignatures
+ satComputePkgHeaders updatePackages reposync
SCRIPTS = satellite-sync spacewalk-debug rhn-entitlement-report \
rhn-schema-version rhn-satellite-activate rhn-charsets \
rhn-ssl-dbstore update-packages rhn-db-stats rhn-schema-stats \
- spacewalk-repo-sync spacewalk-remove-channel
+ spacewalk-repo-sync spacewalk-remove-channel \
+ spacewalk-update-signatures
# check if we can build man pages
DOCBOOK = $(wildcard /usr/bin/docbook2man)
diff --git a/backend/satellite_tools/spacewalk-update-signatures
b/backend/satellite_tools/spacewalk-update-signatures
new file mode 100644
index 0000000..a0a816c
--- /dev/null
+++ b/backend/satellite_tools/spacewalk-update-signatures
@@ -0,0 +1,145 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2008--2010 Red Hat, Inc.
+#
+# Authors: Pradeep Kilambi
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+#
+
+import sys
+import os
+import time
+import shutil
+
+sys.path.append('/usr/share/rhn')
+
+from optparse import Option, OptionParser
+from common import rhnLib, rhnLog, initLOG, CFG, initCFG
+from spacewalk.common import rhn_rpm
+from server.rhnLib import parseRPMFilename, get_package_path
+from server import rhnSQL
+from server.rhnServer import server_packages
+from satellite_tools.progress_bar import ProgressBar
+
+initCFG('server.satellite')
+initLOG(CFG.LOG_FILE, CFG.DEBUG)
+
+OPTIONS = None
+debug = 0
+verbose = 0
+
+options_table = [
+ Option("-v", "--verbose", action="count",
+ help="Increase verbosity"),
+ Option("-d", "--db", action="store",
+ help="DB string to connect to"),
+ Option( "--debug", action="store_true",
+ help="logs the debug information to a log file"),
+]
+
+
+def main():
+ global options_table, debug
+ parser = OptionParser(option_list=options_table)
+
+ (options, args) = parser.parse_args()
+
+ if args:
+ for arg in args:
+ sys.stderr.write("Not a valid option ('%s'), try --help\n"
% arg)
+ sys.exit(-1)
+
+ if options.verbose:
+ verbose = 1
+
+ if options.debug:
+ debug = 1
+
+ if not options.db:
+ sys.stderr.write("--db not specified\n")
+ sys.exit(1)
+
+ print "Connecting to %s" % options.db
+ rhnSQL.initDB(options.db)
+
+ process_package_data()
+
+
+
+_get_needed_pkgs_query = """
+ select P.id, P.path, CV.checksum_type, CV.checksum
+ from rhnPackage P left join
+ rhnPackageKeyAssociation PA on PA.package_id = P.id inner join
+ rhnChecksumView CV on CV.id = P.checksum_id
+ where PA.key_id is null
+"""
+
+
+def process_package_data():
+ global verbose, debug
+
+ if debug:
+ Log = rhnLog.rhnLog('/var/log/rhn/update-packages.log', 5)
+
+ _get_path_sql = rhnSQL.prepare(_get_needed_pkgs_query)
+
+ _get_path_sql.execute()
+ pkgs = _get_path_sql.fetchall_dict()
+
+ if not pkgs:
+ # Nothing to change
+ return
+ if verbose: print "Processing %s packages" % len(pkgs)
+ pb = ProgressBar(prompt='standby: ', endTag=' - Complete!', \
+ finalSize=len(pkgs), finalBarLength=40, stream=sys.stdout)
+ pb.printAll(1)
+ skip_list = []
+ i = 0
+ for pkg in pkgs:
+ pb.addTo(1)
+ pb.printIncrement()
+ path = pkg['path']
+
+ full_path = os.path.join(CFG.MOUNT_POINT, path)
+ checksum_type = pkg['checksum_type']
+ checksum = pkg['checksum']
+
+ if not os.path.exists(full_path):
+ skip_list.append(full_path)
+ Log.writeMessage("File not %s found" % (full_path))
+ continue
+
+ try:
+ hdr = rhn_rpm.get_package_header(filename=full_path)
+ except:
+ rhnSQL.commit()
+ raise
+
+ # Process gpg key ids
+ server_packages.processPackageKeyAssociations(hdr, checksum_type, checksum)
+ if debug: Log.writeMessage("gpg key info updated from %s" %
new_abs_path )
+ i = i + 1
+ # we need to break the transaction to smaller pieces
+ if i % 1000 == 0:
+ rhnSQL.commit()
+ pb.printComplete()
+ # All done, final commit
+ rhnSQL.commit()
+ sys.stderr.write("Transaction Committed! \n")
+ if verbose: print " Skipping %s packages, paths not found" %
len(skip_list)
+ return
+
+
+if __name__ == '__main__':
+ main()
diff --git a/backend/satellite_tools/updateSignatures.py
b/backend/satellite_tools/updateSignatures.py
deleted file mode 100644
index 37e8f84..0000000
--- a/backend/satellite_tools/updateSignatures.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (c) 2008--2010 Red Hat, Inc.
-#
-# Authors: Pradeep Kilambi
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-#
-
-import sys
-import os
-import time
-import shutil
-
-sys.path.append('/usr/share/rhn')
-
-from optparse import Option, OptionParser
-from common import rhnLib, rhnLog, initLOG, CFG, initCFG
-from spacewalk.common import rhn_rpm
-from server.rhnLib import parseRPMFilename, get_package_path
-from server import rhnSQL
-from server.rhnServer import server_packages
-from satellite_tools.progress_bar import ProgressBar
-
-initCFG('server.satellite')
-initLOG(CFG.LOG_FILE, CFG.DEBUG)
-
-OPTIONS = None
-debug = 0
-verbose = 0
-
-options_table = [
- Option("-v", "--verbose", action="count",
- help="Increase verbosity"),
- Option("-d", "--db", action="store",
- help="DB string to connect to"),
- Option( "--debug", action="store_true",
- help="logs the debug information to a log file"),
-]
-
-
-def main():
- global options_table, debug
- parser = OptionParser(option_list=options_table)
-
- (options, args) = parser.parse_args()
-
- if args:
- for arg in args:
- sys.stderr.write("Not a valid option ('%s'), try --help\n"
% arg)
- sys.exit(-1)
-
- if options.verbose:
- verbose = 1
-
- if options.debug:
- debug = 1
-
- if not options.db:
- sys.stderr.write("--db not specified\n")
- sys.exit(1)
-
- print "Connecting to %s" % options.db
- rhnSQL.initDB(options.db)
-
- process_package_data()
-
-
-
-_get_needed_pkgs_query = """
- select P.id, P.path, CV.checksum_type, CV.checksum
- from rhnPackage P left join
- rhnPackageKeyAssociation PA on PA.package_id = P.id inner join
- rhnChecksumView CV on CV.id = P.checksum_id
- where PA.key_id is null
-"""
-
-
-def process_package_data():
- global verbose, debug
-
- if debug:
- Log = rhnLog.rhnLog('/var/log/rhn/update-packages.log', 5)
-
- _get_path_sql = rhnSQL.prepare(_get_needed_pkgs_query)
-
- _get_path_sql.execute()
- pkgs = _get_path_sql.fetchall_dict()
-
- if not pkgs:
- # Nothing to change
- return
- if verbose: print "Processing %s packages" % len(pkgs)
- pb = ProgressBar(prompt='standby: ', endTag=' - Complete!', \
- finalSize=len(pkgs), finalBarLength=40, stream=sys.stdout)
- pb.printAll(1)
- skip_list = []
- i = 0
- for pkg in pkgs:
- pb.addTo(1)
- pb.printIncrement()
- path = pkg['path']
-
- full_path = os.path.join(CFG.MOUNT_POINT, path)
- checksum_type = pkg['checksum_type']
- checksum = pkg['checksum']
-
- if not os.path.exists(full_path):
- skip_list.append(full_path)
- Log.writeMessage("File not %s found" % (full_path))
- continue
-
- try:
- hdr = rhn_rpm.get_package_header(filename=full_path)
- except:
- rhnSQL.commit()
- raise
-
- # Process gpg key ids
- server_packages.processPackageKeyAssociations(hdr, checksum_type, checksum)
- if debug: Log.writeMessage("gpg key info updated from %s" %
new_abs_path )
- i = i + 1
- # we need to break the transaction to smaller pieces
- if i % 1000 == 0:
- rhnSQL.commit()
- pb.printComplete()
- # All done, final commit
- rhnSQL.commit()
- sys.stderr.write("Transaction Committed! \n")
- if verbose: print " Skipping %s packages, paths not found" %
len(skip_list)
- return
-
-
-if __name__ == '__main__':
- main()
-
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index ac118f1..0b55937 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -616,6 +616,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(755,root,root) %{_bindir}/satwho
%attr(755,root,root) %{_bindir}/spacewalk-remove-channel*
%attr(755,root,root) %{_bindir}/rhn-entitlement-report
+%attr(755,root,root) %{_bindir}/spacewalk-update-signatures
%{rhnroot}/satellite_tools/SequenceServer.py*
%{rhnroot}/satellite_tools/messages.py*
%{rhnroot}/satellite_tools/progress_bar.py*
@@ -629,7 +630,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/rhn_ssl_dbstore.py*
%{rhnroot}/satellite_tools/xmlWireSource.py*
%{rhnroot}/satellite_tools/updatePackages.py*
-%{rhnroot}/satellite_tools/updateSignatures.py*
%{rhnroot}/satellite_tools/reposync.py*
%{rhnroot}/satellite_tools/constants.py*
%dir %{rhnroot}/satellite_tools/disk_dumper
commit 7da29c022755e5c8e2e1ace8e4eed90d1dea66f3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 14:47:51 2010 +0200
add epoch to Provides
addressing rpmlint warning:
spacewalk-backend-xmlrpc.noarch: W: self-obsoletion rhns-server-xmlrpc < 5.3.0
obsoletes rhns-server-xmlrpc = 1.1.27-1.git.26.213cbd6.el6
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 456a87c..ac118f1 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -94,7 +94,7 @@ Group: Applications/Internet
Requires: %{name}-server = %{version}-%{release}
Obsoletes: rhns-server-xmlrpc < 5.3.0
Obsoletes: rhns-xmlrpc < 5.3.0
-Provides: rhns-server-xmlrpc = %{version}-%{release}
+Provides: rhns-server-xmlrpc = 1:%{version}-%{release}
Provides: rhns-xmlrpc = 1:%{version}-%{release}
%description xmlrpc
commit f10a3a08e866fd878da185f38c1e6edb4e76c1bf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 14:32:27 2010 +0200
logrotate scripts should have noreplace flag
addressing rpmlint warnings:
spacewalk-backend-app.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-app
spacewalk-backend-applet.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-applet
spacewalk-backend-config-files.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-config-files
spacewalk-backend-config-files-tool.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-config-files-tool
spacewalk-backend-iss.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-iss
spacewalk-backend-iss-export.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-iss-export
spacewalk-backend-package-push-server.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-package-push-server
spacewalk-backend-server.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-server
spacewalk-backend-tools.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-tools
spacewalk-backend-upload-server.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-upload-server
spacewalk-backend-xmlrpc.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-xmlrpc
spacewalk-backend-xp.noarch: W: conffile-without-noreplace-flag
/etc/logrotate.d/spacewalk-backend-xp
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0850f46..456a87c 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -466,7 +466,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%endif
# logs and other stuff
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-server
# translations
%{rhnroot}/locale
@@ -482,7 +482,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-xmlrpc
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-xmlrpc
%files applet
%defattr(-,root,root)
@@ -492,7 +492,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_applet.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-applet
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-applet
%files app
%defattr(-,root,root)
@@ -502,7 +502,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_app.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-app
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-app
%files xp
%defattr(-,root,root)
@@ -512,14 +512,14 @@ rm -f %{rhnconf}/rhnSecret.py*
# config files
%attr(644,root,apache) %{rhnconf}/default/rhn_server_xp.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-xp
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-xp
%files iss
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/sat
%{rhnroot}/server/handlers/sat/*
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-iss
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-sat.conf
%files iss-export
@@ -534,7 +534,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_exporter/handlers/non_auth_dumper.py*
# config files
%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-sat-export-internal.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-iss-export
%attr(644,root,apache) %{rhnconf}/default/rhn_server_satexport_internal.conf
@@ -557,7 +557,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/config/*
%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
%files config-files-tool
%defattr(-,root,root)
@@ -566,7 +566,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/server/handlers/config_mgmt/*
%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
%files upload-server
%defattr(-,root,root)
@@ -579,7 +579,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/upload_server/handlers/package
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-upload-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-upload-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-pkg-upload.conf
%files package-push-server
@@ -593,14 +593,14 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/upload_server/handlers/package_push
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
%files tools
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
%attr(644,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
-%config %{_sysconfdir}/logrotate.d/spacewalk-backend-tools
+%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-tools
%attr(755,root,root) %{_bindir}/rhn-charsets
%attr(755,root,root) %{_bindir}/rhn-satellite-activate
%attr(755,root,root) %{_bindir}/rhn-schema-version