[spacewalk-branding] Rebase to spacewalk-branding-1.6.4-1.fc16 in rawhide.

[Miroslav Suchý]

commit dcb60fd6e62a94c5da6911ffc82c16b08784af5b
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jan 2 16:05:00 2012 +0100

    Rebase to spacewalk-branding-1.6.4-1.fc16 in rawhide.

 .gitignore              |    1 +
 sources                 |    2 +-
 spacewalk-branding.spec |   28 ++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3c42ab..f2a7711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /spacewalk-branding-1.3.1.tar.gz
 /spacewalk-branding-1.4.3.tar.gz
+/spacewalk-branding-1.6.4.tar.gz
diff --git a/sources b/sources
index b828586..b8c5ba6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f97c1daa9a570936e198454ad0060a0  spacewalk-branding-1.4.3.tar.gz
+dc241c254ed81b6d05fa7a34cab17909  spacewalk-branding-1.6.4.tar.gz
diff --git a/spacewalk-branding.spec b/spacewalk-branding.spec
index a1d0d17..67ceb24 100644
--- a/spacewalk-branding.spec
+++ b/spacewalk-branding.spec
@@ -1,5 +1,5 @@
 Name:       spacewalk-branding
-Version:    1.4.3
+Version:    1.6.4
 Release:    1%{?dist}
 Summary:    Spacewalk branding data
 
@@ -39,7 +39,7 @@ install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
 install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/
 %endif
 install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
-install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn/default
+install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
 cp -pR css %{buildroot}/%{_var}/www/html/
 cp -pR img %{buildroot}/%{_var}/www/html/
 # Appplication expects two favicon's for some reason, copy it so there's just
@@ -54,7 +54,7 @@ ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat5/weba
 %else
 ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
 %endif
-cp -p conf/rhn_docs.conf %{buildroot}/%{_sysconfdir}/rhn/default/rhn_docs.conf
+cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
 
 %clean
 rm -rf %{buildroot}
@@ -79,10 +79,30 @@ rm -rf %{buildroot}
 %else
 %{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
 %endif
-%{_sysconfdir}/rhn/default/rhn_docs.conf
+%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
 %doc LICENSE
 
 %changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.4-1
+- 621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (branding).
+
+* Fri Sep 02 2011 Jan Pazdziora 1.6.3-1
+- 558972 - making the navigational bar nice on 2000+ px wide screens.
+
+* Fri Aug 05 2011 Jan Pazdziora 1.6.2-1
+- 458413 - hide the bubble help links since we do not ship the documentation
+  with Spacewalk.
+
+* Fri Jul 22 2011 Jan Pazdziora 1.6.1-1
+- cleanup: revhistory style is not used (msuchy at redhat.com)
+- fix typos in css (msuchy at redhat.com)
+
+* Tue Jun 21 2011 Jan Pazdziora 1.5.2-1
+- 708957 - remove RHN Satellite Proxy Release Notes link (tlestach at redhat.com)
+
+* Tue May 10 2011 Jan Pazdziora 1.5.1-1
+- 484895 - Point the release notes dispatcher to fedorahosted.org.
+
 * Wed Mar 30 2011 Jan Pazdziora 1.4.3-1
 - update copyright years (msuchy at redhat.com)
 - implement common access keys (msuchy at redhat.com)