msuchy pushed to spacewalk-config (master). "Update spacewalk-config to 2.3.17-1 (..more)"

Wed Apr 15 05:30:02 UTC 2015

>From 2a96e0c9eb76ba9da7b472525427eb7ba24d00f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy at redhat.com>
Date: Wed, 15 Apr 2015 07:29:39 +0200
Subject: Update spacewalk-config to 2.3.17-1 Resolves: #1170064 - equality is
 too strict Resolves: #1020952 - Include SSL configuration in setup

diff --git a/.gitignore b/.gitignore
index 5dceb0e..fe484d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /spacewalk-config-2.0.1.tar.gz
 /spacewalk-config-2.1.5.tar.gz
 /spacewalk-config-2.2.2.tar.gz
+/spacewalk-config-2.3.17.tar.gz
diff --git a/sources b/sources
index 67faa04..d09dd34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b34af3508503d51d158b65150e524a86  spacewalk-config-2.2.2.tar.gz
+2684ac4feef07a2f11512b28c9c03ce7  spacewalk-config-2.3.17.tar.gz
diff --git a/spacewalk-config.spec b/spacewalk-config.spec
index 9dc14c1..d4449a8 100644
--- a/spacewalk-config.spec
+++ b/spacewalk-config.spec
@@ -1,6 +1,6 @@
 Name: spacewalk-config
 Summary: Spacewalk Configuration
-Version: 2.2.2
+Version: 2.3.17
 Release: 1%{?dist}
 URL: http://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -9,7 +9,6 @@ Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildarch: noarch
 Requires: perl(Satcon)
-Requires: perl(Apache::DBI)
 Obsoletes: rhn-satellite-config < 5.3.0
 Provides: rhn-satellite-config = 5.3.0
 Requires(post): chkconfig
@@ -55,7 +54,6 @@ find $RPM_BUILD_ROOT -name '*.symlink' | \
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%config(noreplace) %{_sysconfdir}/rhn/satellite-httpd/conf/rhn/rhn_monitoring.conf
 %attr(400,root,root) %config(noreplace) %{_sysconfdir}/rhn/spacewalk-repo-sync/uln.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-www.conf
 %config(noreplace) %{_sysconfdir}/webapp-keyring.gpg
@@ -65,10 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_var}/lib/cobbler/kickstarts/spacewalk-sample.ks
 %config(noreplace) %{_var}/lib/cobbler/snippets/spacewalk_file_preservation
 %attr(0750,root,apache) %dir %{_sysconfdir}/rhn
-%dir %{_sysconfdir}/rhn/satellite-httpd
-%dir %{_sysconfdir}/rhn/satellite-httpd/conf
-%dir %{_sysconfdir}/rhn/satellite-httpd/conf/rhn
-%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/rhn/cluster.ini
 %attr(0640,root,apache) %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/rhn/rhn.conf
 # NOTE: If if you change these, you need to make a corresponding change in
 # spacewalk/install/Spacewalk-Setup/bin/spacewalk-setup
@@ -79,10 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_var}/lib/rhn/rhn-satellite-prep
 %dir %{_var}/lib/rhn/rhn-satellite-prep/etc
 %attr(0750,root,apache) %dir %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn
-%attr(0640,root,apache) %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn/cluster.ini
 %attr(0640,root,apache) %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
 %dir %{_prefix}/share/rhn
-%attr(0755,root,root) %{_prefix}/share/rhn/satidmap.pl
 %attr(0755,root,root) %{_prefix}/share/rhn/startup.pl
 %doc LICENSE
 %doc %{_mandir}/man5/rhn.conf.5*
@@ -99,12 +91,73 @@ if [ -f /etc/init.d/satellite-httpd ] ; then
 fi
 
 # Set the group to allow Apache to access the conf files ...
-chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
+chgrp apache /etc/rhn /etc/rhn/rhn.conf 2> /dev/null || :
 # ... once we restrict access to some files that were too open in
 # the past.
-chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
+chmod o-rwx /etc/rhn/rhn.conf* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
 
 %changelog
+* Thu Mar 19 2015 Grant Gainey 2.3.17-1
+- remove unused dependency
+
+* Fri Mar 13 2015 Tomas Lestach <tlestach at redhat.com> 2.3.16-1
+- preparations for mod_perl removal
+
+* Fri Mar 13 2015 Tomas Lestach <tlestach at redhat.com> 2.3.15-1
+- do not reference Apache2::SizeLimit
+
+* Thu Mar 12 2015 Tomas Lestach <tlestach at redhat.com> 2.3.14-1
+- satellite-rules do not seem to be used, removing
+
+* Thu Mar 12 2015 Tomas Lestach <tlestach at redhat.com> 2.3.13-1
+- removing RHN::Cleansers
+- removing RHN::Access and PXT::ACL
+- remove apache PXT configuration
+- no more pxt pages
+
+* Mon Mar 09 2015 Tomas Lestach <tlestach at redhat.com> 2.3.12-1
+- stop using permission.pxt error document
+
+* Thu Mar 05 2015 Tomas Lestach <tlestach at redhat.com> 2.3.11-1
+- we do not have /var/www/html/network anymore
+
+* Wed Mar 04 2015 Tomas Lestach <tlestach at redhat.com> 2.3.10-1
+- removing unused pxt error pages
+- removing packages/package_map_raw as it isn't referenced
+- removing packages/view_readme as it isn't referenced
+
+* Tue Mar 03 2015 Tomas Lestach <tlestach at redhat.com> 2.3.9-1
+- start using the jsp error pages
+
+* Fri Feb 27 2015 Tomas Lestach <tlestach at redhat.com> 2.3.8-1
+- removing system_list/proxy.pxt as it isn't referenced anymore
+- remove unused raw_script_output.txt
+
+* Wed Feb 25 2015 Tomas Lestach <tlestach at redhat.com> 2.3.7-1
+- removing subscribers.pxt as it was ported to java
+
+* Tue Feb 24 2015 Tomas Lestach <tlestach at redhat.com> 2.3.6-1
+- removing activation.pxt as it was ported to java
+
+* Mon Feb 16 2015 Stephen Herr <sherr at redhat.com> 2.3.5-1
+- spacewalk-config etc/rhn-satellite-httpd dir no longer exists after
+  monitoring removal
+
+* Mon Feb 16 2015 Stephen Herr <sherr at redhat.com> 2.3.4-1
+- remove monitoring artefacts from spacewalk-config
+
+* Tue Jan 13 2015 Matej Kollar <mkollar at redhat.com> 2.3.3-1
+- Getting rid of trailing spaces in Perl
+- Getting rid of Tabs and trailing spaces in LICENSE, COPYING, and README files
+
+* Wed Dec 17 2014 Stephen Herr <sherr at redhat.com> 2.3.2-1
+- drop monitoring code and monitoring schema
+- 1170064 - equality is too strict
+
+* Thu Dec 11 2014 Matej Kollar <mkollar at redhat.com> 2.3.1-1
+- 1020952 - Include SSL configuration in setup
+- Bumping package versions for 2.3.
+
 * Tue Jul 08 2014 Milan Zazrivec <mzazrivec at redhat.com> 2.2.2-1
 - make JSESSIONID cookie httpOnly
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/spacewalk-config.git/commit/?h=master&id=2a96e0c9eb76ba9da7b472525427eb7ba24d00f7
