[spacewalk-branding] Rebase to spacewalk-branding-2.0.1-1.fc19 in rawhide.

Mon Jul 22 08:05:28 UTC 2013

commit 1e4271ec8fa30b606cf81585473e0c86087078d7
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jul 22 10:04:44 2013 +0200

    Rebase to spacewalk-branding-2.0.1-1.fc19 in rawhide.

 .gitignore              |    1 +
 sources                 |    2 +-
 spacewalk-branding.spec |  119 ++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 93 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6a6f29d..834b70c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /spacewalk-branding-1.7.1.tar.gz
 /spacewalk-branding-1.8.7.tar.gz
 /spacewalk-branding-1.9.6.tar.gz
+/spacewalk-branding-2.0.1.tar.gz
diff --git a/sources b/sources
index 4ba8bfc..9df5197 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f4366feb974a10f9ea7f45f57d4344c  spacewalk-branding-1.9.6.tar.gz
+2a4b918d3cd08e573a31098857775d28  spacewalk-branding-2.0.1.tar.gz
diff --git a/spacewalk-branding.spec b/spacewalk-branding.spec
index 19329d3..af5c87c 100644
--- a/spacewalk-branding.spec
+++ b/spacewalk-branding.spec
@@ -1,5 +1,15 @@
+%if  0%{?rhel} && 0%{?rhel} < 6
+%global tomcat tomcat5
+%else
+%if 0%{?fedora}
+%global tomcat tomcat
+%else
+%global tomcat tomcat6
+%endif
+%endif
+
 Name:       spacewalk-branding
-Version:    1.9.6
+Version:    2.0.1
 Release:    1%{?dist}
 Summary:    Spacewalk branding data
 
@@ -32,15 +42,7 @@ install -d -m 755 %{buildroot}%{_datadir}/spacewalk
 install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web
 install -d -m 755 %{buildroot}%{_datadir}/spacewalk/web/nav
 install -d -m 755 %{buildroot}%{_datadir}/rhn/lib/
-%if  0%{?rhel} && 0%{?rhel} < 6
-install -d -m 755 %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
-%else
-%if 0%{?fedora}
-install -d -m 755 %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/
-%else
-install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/
-%endif
-%endif
+install -d -m 755 %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/
 install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
 install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
 cp -pR css %{buildroot}/%{_var}/www/html/
@@ -52,15 +54,7 @@ cp -pR templates %{buildroot}%{_datadir}/spacewalk/web/
 cp -pR styles %{buildroot}%{_datadir}/spacewalk/web/nav/
 cp -pR setup  %{buildroot}%{_datadir}/spacewalk/
 cp -pR java-branding.jar %{buildroot}%{_datadir}/rhn/lib/
-%if  0%{?rhel} && 0%{?rhel} < 6
-ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar
-%else
-%if 0%{?fedora}
-ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar
-%else
-ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
-%endif
-%endif
+ln -s %{_datadir}/rhn/lib/java-branding.jar %{buildroot}%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/java-branding.jar
 cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
 
 %clean
@@ -75,19 +69,88 @@ rm -rf %{buildroot}
 %{_var}/www/html/favicon.ico
 %{_datadir}/spacewalk/
 %{_datadir}/rhn/lib/java-branding.jar
-%if  0%{?rhel} && 0%{?rhel} < 6
-%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/java-branding.jar
-%else
-%if 0%{?fedora}
-%{_var}/lib/tomcat/webapps/rhn/WEB-INF/lib/java-branding.jar
-%else
-%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
-%endif
-%endif
+%{_var}/lib/%{tomcat}/webapps/rhn/WEB-INF/lib/java-branding.jar
 %{_prefix}/share/rhn/config-defaults/rhn_docs.conf
 %doc LICENSE
 
 %changelog
+* Wed Jul 17 2013 Tomas Kasparek <tkasparek at redhat.com> 2.0.1-1
+- Bumping package versions for 2.0.
+
+* Mon Jul 08 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.21-1
+- making display-none of class help-title spacewalk-spcecific only
+
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.20-1
+- fix of some css errors
+
+* Mon Jun 17 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.19-1
+- rebranding few more strings
+
+* Wed Jun 05 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.18-1
+- moving #rhn_welcome to spacewalk specific styles
+
+* Fri May 17 2013 Tomas Lestach <tlestach at redhat.com> 1.10.17-1
+- 591988 - render error messages without dot in front of them
+
+* Tue May 07 2013 Jan Pazdziora 1.10.16-1
+- removing unnecessary css property
+- removing duplicate left border in tables containing checkbox as 1st column
+
+* Thu Apr 11 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.15-1
+- overlap of currently active section on top-nav
+
+* Wed Mar 27 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.14-1
+- fix css in duplicate system comparsion
+
+* Wed Mar 27 2013 Michael Mraka <michael.mraka at redhat.com> 1.10.13-1
+- adding back accidentaly deleted css style
+
+* Wed Mar 27 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.12-1
+- pixel perfecting first and last-child of th when sorting by them
+
+* Tue Mar 26 2013 Jan Pazdziora 1.10.11-1
+- indentation of ssm buttons from top of bar whoch contains them
+
+* Fri Mar 22 2013 Michael Mraka <michael.mraka at redhat.com> 1.10.10-1
+- simplify tomcat version decisison
+
+* Wed Mar 20 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.9-1
+- changing structure of css files
+
+* Sun Mar 17 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.8-1
+- removing unreferenced images from spacewalk-branding
+
+* Thu Mar 14 2013 Jan Pazdziora 1.10.7-1
+- rhn-iecompat.css is never used - delete it
+
+* Thu Mar 14 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.6-1
+- removing unused styles from rhn-basic.css
+- removing unused styles from blue-docs.css
+
+* Wed Mar 13 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.5-1
+- removing unused styles and refactoring blue-nav-top.css and adjacent files
+- removing unused styles from rhn-header.css
+- removing unused styles from rhn-listview.css
+- removing unused styles from rhn-messaging.css
+- removing unused styles from rhn-nav-sidenav.css
+- rmoving some unused styles from rhn-status.css
+
+* Tue Mar 12 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.4-1
+- clean up of rhn-special-styles.css and adjacent files
+- removing css hacks for vintage versions of IE
+
+* Mon Mar 11 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.3-1
+- removing duplicate css
+- removing -moz- in front of border-radius
+- css changes - table borders
+
+* Fri Mar 08 2013 Milan Zazrivec <mzazrivec at redhat.com> 1.10.2-1
+- removing filter input from page when printing
+
+* Wed Mar 06 2013 Tomas Kasparek <tkasparek at redhat.com> 1.10.1-1
+- using css3 border-radius instead of images to render round edges
+- Bumping package versions for 1.9
+
 * Fri Mar 01 2013 Tomas Lestach <tlestach at redhat.com> 1.9.6-1
 - introducing crash logo
 - Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
