[spacewalk-branding] Rebase to spacewalk-branding-1.9.6-1.fc18 in rawhide.
Miroslav Suchý
msuchy at fedoraproject.org
Wed Mar 6 15:42:26 UTC 2013
commit 5fff5d0ff05141df4df9c009eb858be36911b569
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Wed Mar 6 16:42:22 2013 +0100
Rebase to spacewalk-branding-1.9.6-1.fc18 in rawhide.
.gitignore | 1 +
sources | 2 +-
spacewalk-branding.spec | 160 ++++++++++++-----------------------------------
3 files changed, 43 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2678b73..6a6f29d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/spacewalk-branding-1.6.4.tar.gz
/spacewalk-branding-1.7.1.tar.gz
/spacewalk-branding-1.8.7.tar.gz
+/spacewalk-branding-1.9.6.tar.gz
diff --git a/sources b/sources
index eac7513..4ba8bfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cda5ce30f414dffb61ec611561ec8b94 spacewalk-branding-1.8.7.tar.gz
+8f4366feb974a10f9ea7f45f57d4344c spacewalk-branding-1.9.6.tar.gz
diff --git a/spacewalk-branding.spec b/spacewalk-branding.spec
index 102f52b..19329d3 100644
--- a/spacewalk-branding.spec
+++ b/spacewalk-branding.spec
@@ -1,6 +1,6 @@
Name: spacewalk-branding
-Version: 1.8.7
-Release: 2%{?dist}
+Version: 1.9.6
+Release: 1%{?dist}
Summary: Spacewalk branding data
Group: Applications/Internet
@@ -27,17 +27,20 @@ jar -cf java-branding.jar -C java/code/src com
%install
rm -rf %{buildroot}
-install -d -m 755 %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -p -m 644 zz-spacewalk-branding.conf %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -d -m 755 %{buildroot}/%{_var}/www/html
-install -d -m 755 %{buildroot}/%{_var}/www/html/nav
+install -d -m 755 %{buildroot}%{_var}/www/html
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}/%{_sysconfdir}/rhn
install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
cp -pR css %{buildroot}/%{_var}/www/html/
@@ -45,15 +48,19 @@ cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
# one in source:
cp -p img/favicon.ico %{buildroot}/%{_var}/www/html/
-cp -pR templates %{buildroot}/%{_var}/www/html/
-cp -pR styles %{buildroot}/%{_var}/www/html/nav/
+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
cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%clean
@@ -61,29 +68,48 @@ rm -rf %{buildroot}
%files
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/zz-spacewalk-branding.conf
%dir %{_var}/www/html/css
%{_var}/www/html/css/*
%dir /%{_var}/www/html/img
%{_var}/www/html/img/*
%{_var}/www/html/favicon.ico
-%dir /%{_var}/www/html/templates
-%{_var}/www/html/templates/*
-%dir /%{_var}/www/html/nav/styles
-%{_var}/www/html/nav/styles/*
%{_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
%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%doc LICENSE
%changelog
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* 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.
+
+* Thu Jan 31 2013 Michael Mraka <michael.mraka at redhat.com> 1.9.5-1
+- removed no longer necessary directory definitions
+- pack branding template files outside of document root
+
+* Tue Dec 04 2012 Jan Pazdziora 1.9.4-1
+- On Fedoras, start to use tomcat >= 7.
+
+* Wed Nov 28 2012 Tomas Lestach <tlestach at redhat.com> 1.9.3-1
+- 470463 - fixing xmllint issue
+
+* Mon Nov 12 2012 Tomas Lestach <tlestach at redhat.com> 1.9.2-1
+- Fix typos
+
+* Mon Nov 12 2012 Tomas Lestach <tlestach at redhat.com> 1.9.1-1
+- 866326 - customize KickstartFileDownloadAdvanced.do page in case of kickstart
+ file DownloadException
+- reformated using xmllint -format
+- Bumping package versions for 1.9.
* Wed Oct 24 2012 Jan Pazdziora 1.8.7-1
- WebUI - css for @media print
@@ -169,107 +195,3 @@ rm -rf %{buildroot}
* Mon Apr 19 2010 Michael Mraka <michael.mraka at redhat.com> 1.1.1-1
- bumping spec files to 1.1 packages
-* Wed Mar 24 2010 Michael Mraka <michael.mraka at redhat.com> 0.9.4-1
-- resigning spacewalk cert
-- 516048 - syncing java stack with perl stack on channel naming convention
-
-* Mon Mar 08 2010 Michael Mraka <michael.mraka at redhat.com> 0.9.3-1
-- 486430 - changed organization name in default cert
-
-* Thu Feb 11 2010 Justin Sherrill <jsherril at redhat.com> 0.9.2-1
-- updating branding package for tomcat6 (jsherril at redhat.com)
-- let's start Spacewalk 0.9 (michael.mraka at redhat.com)
-
-* Fri Jan 29 2010 Miroslav Suchý <msuchy at redhat.com> 0.8.2-1
-- upadating spacewalk cert (jsherril at redhat.com)
-
-* Fri Jan 08 2010 Jan Pazdziora 0.8.1-1
-- Update copyright years to end with 2010.
-- Dead code removal.
-- bumping Version to 0.8.0 (msuchy at redhat.com)
-
-* Wed Sep 02 2009 Michael Mraka <michael.mraka at redhat.com> 0.7.1-1
-- Add symlink capability to config management (joshua.roys at gtri.gatech.edu)
-- add the Chat graphic as an advertisement to the layouts
-- allow users to chat with spacewalk members on IRC via the web
-
-* Tue Jul 21 2009 John Matthews <jmatthew at redhat.com> 0.6.8-1
-- 510146 - Update copyright years from 2002-08 to 2002-09.
- (dgoodwin at redhat.com)
-
-* Tue Jun 30 2009 Miroslav Suchy <msuchy at redhat.com> 0.6.7-1
-- 508710 - make bar on top of page wider, so we do not get empty space on wider displays
-
-* Thu Jun 25 2009 John Matthews <jmatthew at redhat.com> 0.6.6-1
-- 506489 - remove the link associated with the org name present in the UI
- header (bbuckingham at redhat.com)
-- 505101 - update css so that links are underlined when hovering
- (bbuckingham at redhat.com)
-- fix to shwo the correct error message css (paji at redhat.com)
-
-* Wed May 27 2009 jesus m. rodriguez <jesusr at redhat.com> 0.6.5-1
-- 500806 - limit a:hover to links only, changed to a:link:hover (jesusr at redhat.com)
-
-* Thu May 21 2009 jesus m. rodriguez <jesusr at redhat.com> 0.6.4-1
-- 501038 - Update css to mitigate wrapping of long org names. (jortel at redhat.com)
-
-* Wed May 06 2009 jesus m. rodriguez <jesusr at redhat.com> 0.6.3-1
-- 444221 - More fixes related to snippet pages in general (paji at redhat.com)
-- 484962 - Cleanup System Overview alerts. (dgoodwin at redhat.com)
-- 480011 - Added organization to the top header near the username (jason.dobies at redhat.com)
-
-* Mon Apr 20 2009 jesus m. rodriguez <jesusr at redhat.com> 0.6.2-1
-- 496321 - add Documentation as a search option on perl pages (jesusr at redhat.com)
-
-* Wed Apr 15 2009 Devan Goodwin <dgoodwin at redhat.com> 0.6.1-1
-- 494475,460136 - remove faq & feedback code which used customer service emails.
- (jesusr at redhat.com)
-- 443132 - Converted action lists to new list tag. (jsherril at redhat.com)
-
-* Thu Mar 26 2009 jesus m. rodriguez <jesusr at redhat.com> 0.5.8-1
-- removing satellite-debug link
-
-* Wed Feb 18 2009 Brad Buckingham <bbuckingham at redhat.com> 0.5.7-1
-- adding rhn_docs.conf to enable configurable docs location
-
-* Wed Feb 04 2009 Devan Goodwin <dgoodwin at redhat.com> 0.5.5-1
-- Add /var/www/html/favicon.ico.
-
-* Fri Jan 30 2009 Mike McCune <mmccune at gmail.com> 0.5.4-1
-- going back to just spacewalk-branding but removing requires: spacewalk-html
-
-* Wed Jan 28 2009 Mike McCune <mmccune at gmail.com> 0.5.3-1
-- split out branding jar into its own subpackage.
-
-* Wed Jan 21 2009 Michael Mraka <michael.mraka at redhat.com> 0.5.1-1
-- modified branding according to jsp layout changes
-
-* Mon Dec 22 2008 Michael Mraka <michael.mraka at redhat.com> 0.4.1-1
-- added spacewalk-public.cert and spacewalk-cert.conf
-
-* Thu Oct 23 2008 Jesus M. Rodriguez <jesusr at redhat.com> 0.1.6-1
-- fix square corner on left tab.
-
-* Fri Aug 29 2008 Jesus M. Rodriguez <jesusr at redhat.com> 0.1.5-1
-- bz: 460313 css fix for search bar in top right header.
-
-* Tue Aug 12 2008 Devan Goodwin 0.1.4-0
-- Adding nav styles.
-
-* Thu Aug 07 2008 Devan Goodwin 0.1.3-0
-- Adding templates.
-
-* Wed Aug 6 2008 Jan Pazdziora 0.1.2-0
-- decrease version to 0.1.*
-- tag for rebuild
-
-* Mon Aug 04 2008 Miroslav Suchy <msuchy at redhat.com>
-- fix dependecies, requires spacewalk-html
-- bump version
-
-* Wed Jul 30 2008 Devan Goodwin <dgoodwin at redhat.com> 0.2-2
-- Adding images.
-
-* Tue Jul 29 2008 Devan Goodwin <dgoodwin at redhat.com> 0.2-1
-- Initial packaging.
-
More information about the scm-commits
mailing list