branding/css
by Tomáš Kašpárek
branding/css/rhn-basic.css | 4 ----
branding/css/spacewalk-specific.css | 5 +++++
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e8b591425016616f7ee0db502f689eb404105898
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 15:43:50 2013 +0200
making display-none of class help-title spacewalk-spcecific only
diff --git a/branding/css/rhn-basic.css b/branding/css/rhn-basic.css
index 362deea..9fc90dd 100644
--- a/branding/css/rhn-basic.css
+++ b/branding/css/rhn-basic.css
@@ -101,10 +101,6 @@ a[name]:hover {
text-decoration: none !important;
}
-.help-title {
- display: none;
-}
-
a.help-title {
vertical-align: top;
}
diff --git a/branding/css/spacewalk-specific.css b/branding/css/spacewalk-specific.css
index 3f1a32c..c4ede01 100644
--- a/branding/css/spacewalk-specific.css
+++ b/branding/css/spacewalk-specific.css
@@ -116,3 +116,8 @@ div#mainNavWrap ul li#mainLast-active {
background-repeat: no-repeat;
height: 40px;
}
+
+.help-title {
+ display: none;
+}
+
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.120-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.120-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-08 13:39 +0000
Tagging package [spacewalk-java] version [1.10.120-1] in directory [java/].
Changes since spacewalk-java-1.10.119-1:
Tomas Kasparek (5):
crating symlinks for taskomatic to work on fedora 19
making ActionType seriazible to prevent ehcache exceptions
stop spamming catalina.out with ehcache using defaults message
stop spamming taskomatic log with ehcache using defaults message
Automatic commit of package [spacewalk-java] release [1.10.120-1].
---
java/buildconf/build-props.xml | 8 -----
java/code/src/com/redhat/rhn/domain/action/ActionType.java | 2 -
java/code/src/log4j.properties | 3 ++
java/conf/log4j.properties.taskomatic | 3 ++
java/spacewalk-java.spec | 18 ++++++++-----
rel-eng/packages/spacewalk-java | 2 -
6 files changed, 21 insertions(+), 15 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit f466b9088d1dd65c36b9c8ba776bc2a59f5ef74f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 15:39:30 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.120-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c9b51e1..e454147 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.119
+Version: 1.10.120
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -770,6 +770,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 08 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.120-1
+- stop spamming taskomatic log with ehcache using defaults message
+- stop spamming catalina.out with ehcache using defaults message
+- making ActionType seriazible to prevent ehcache exceptions
+- crating symlinks for taskomatic to work on fedora 19
+
* Mon Jul 08 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.119-1
- creating symlinks for tomcat on Fedora 19
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 63b4873..a0ddf27 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.119-1 java/
+1.10.120-1 java/
10 years, 11 months
4 commits - java/buildconf java/code java/conf java/spacewalk-java.spec
by Tomáš Kašpárek
java/buildconf/build-props.xml | 8 +-------
java/code/src/com/redhat/rhn/domain/action/ActionType.java | 2 +-
java/code/src/log4j.properties | 3 +++
java/conf/log4j.properties.taskomatic | 3 +++
java/spacewalk-java.spec | 10 +++++-----
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit cf284e755718d0ab859fe22c60f262ff1053d825
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 15:35:44 2013 +0200
stop spamming taskomatic log with ehcache using defaults message
diff --git a/java/conf/log4j.properties.taskomatic b/java/conf/log4j.properties.taskomatic
index d739c11..e5fd3a2 100644
--- a/java/conf/log4j.properties.taskomatic
+++ b/java/conf/log4j.properties.taskomatic
@@ -32,5 +32,8 @@ log4j.logger.com.redhat.rhn.taskomatic.task=INFO
#log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
+# this silences ehcache on Fedoras complaining about using default values
+log4j.logger.net.sf.ehcache.hibernate.AbstractEhcacheRegionFactory=ERROR
+
# General debug for everything. Very noisy
#log4j.logger.com.redhat.rhn=DEBUG
commit 63eae6d74b4c3406d24b38a9d0da354a14994721
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 15:34:07 2013 +0200
stop spamming catalina.out with ehcache using defaults message
diff --git a/java/code/src/log4j.properties b/java/code/src/log4j.properties
index de268b7..df8a320 100644
--- a/java/code/src/log4j.properties
+++ b/java/code/src/log4j.properties
@@ -40,5 +40,8 @@ log4j.logger.com.redhat.rhn.taskomatic.SchedulerKernel=INFO
#log4j.logger.net.rkbloom.logdriver.LogCallableStatement=DEBUG
#log4j.logger.net.rkbloom.logdriver.LogConnection=DEBUG,HibernateAppender
+# this silences ehcache on Fedoras complaining about using default values
+log4j.logger.net.sf.ehcache.hibernate.AbstractEhcacheRegionFactory=ERROR
+
# General debug for everything. Very noisy
#log4j.logger.com.redhat.rhn=DEBUG
commit c13fcf0024cfc3609cca2d161b7ddcb25d0e6462
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 15:18:26 2013 +0200
making ActionType seriazible to prevent ehcache exceptions
diff --git a/java/code/src/com/redhat/rhn/domain/action/ActionType.java b/java/code/src/com/redhat/rhn/domain/action/ActionType.java
index 4ad7860..dd725d3 100644
--- a/java/code/src/com/redhat/rhn/domain/action/ActionType.java
+++ b/java/code/src/com/redhat/rhn/domain/action/ActionType.java
@@ -21,7 +21,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
* ActionType
* @version $Rev$
*/
-public class ActionType {
+public class ActionType implements Serializable {
private Integer id;
private String label;
commit 304b9decfb2f69aa20afcf201ff3634eb0c9e51d
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 14:09:49 2013 +0200
crating symlinks for taskomatic to work on fedora 19
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index 9cc596a..daabc74 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -58,13 +58,7 @@
<property name="hibernate3.2deps" value="hibernate3"/>
- <condition property="jboss-logging-jars"
- value="jboss-logging/jboss-logging"
- else="jboss-logging">
- <available file="/usr/share/java/jboss-logging/jboss-logging.jar" />
- </condition>
-
- <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api ${jboss-logging-jars} javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
+ <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api jboss-logging javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
<condition property="hibernate"
value="${hibernate3.2deps}"
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ddfbbfe..c9b51e1 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -449,6 +449,7 @@ ln -s -f %{_javadir}/hibernate3/hibernate-ehcache.jar $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadir}
ln -s -f %{_javadir}/apache-commons-validator.jar $RPM_BUILD_ROOT%{_javadir}/commons-validator.jar
ln -s -f %{_javadir}/mchange-commons-java.jar $RPM_BUILD_ROOT%{_javadir}/mchange-commons.jar
+ln -s -f %{_javadir}/jboss-logging/jboss-logging.jar $RPM_BUILD_ROOT%{_javadir}/jboss-logging.jar
%endif
%if 0%{?rhel} && 0%{?rhel} < 6
@@ -638,11 +639,6 @@ fi
%{jardir}/hibernate_hibernate-commons-annotations.jar
%{jardir}/hibernate-jpa-2.0-api.jar
%{jardir}/javassist.jar
-%if 0%{?fedora} && 0%{?fedora} > 18
-%{jardir}/jboss-logging_jboss-logging.jar
-%else
-%{jardir}/jboss-logging.jar
-%endif
%{jardir}/slf4j_api.jar
%{jardir}/slf4j_log4j12.jar
%endif
@@ -654,6 +650,10 @@ fi
%if 0%{?fedora} && 0%{?fedora} > 18
%{_javadir}/commons-validator.jar
%{_javadir}/mchange-commons.jar
+%{_javadir}/jboss-logging.jar
+%{jardir}/jboss-loggingjboss-logging.jar
+%else
+%{jardir}/jboss-logging.jar
%endif
%{jardir}/jaf.jar
%{jardir}/javamail.jar
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.119-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.119-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-08 08:05 +0000
Tagging package [spacewalk-java] version [1.10.119-1] in directory [java/].
Changes since cobbler20-2.0.11-20:
Tomas Kasparek (2):
creating symlinks for tomcat on Fedora 19
Automatic commit of package [spacewalk-java] release [1.10.119-1].
---
java/spacewalk-java.spec | 18 +++++++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 16 insertions(+), 4 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9f505db6b379495d1bda7d6aeb8471167dcfda95
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 10:05:31 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.119-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 58fdce9..ddfbbfe 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.118
+Version: 1.10.119
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -770,6 +770,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 08 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.119-1
+- creating symlinks for tomcat on Fedora 19
+
* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.118-1
- skip xliff checks for fedora 19
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index e6b0a3e..63b4873 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.118-1 java/
+1.10.119-1 java/
10 years, 11 months
java/spacewalk-java.spec
by Tomáš Kašpárek
java/spacewalk-java.spec | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 7657e794b0833126f32c97d2aa9ca99db05a5361
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 8 09:29:42 2013 +0200
creating symlinks for tomcat on Fedora 19
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index abef9be..58fdce9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -379,8 +379,6 @@ if test -d /usr/share/tomcat6; then
fi
%if 0%{?fedora} && 0%{?fedora} >= 19
-# checkstyle is broken on Fedoras - we skip for now
-# RHEL5 checkstyle4 is incompatible with checkstyle5
%define skip_xliff 1
%endif
@@ -446,6 +444,13 @@ ln -s -f %{_javadir}/hibernate3/hibernate-c3p0.jar $RPM_BUILD_ROOT%{_javadir}/hi
ln -s -f %{_javadir}/hibernate3/hibernate-ehcache.jar $RPM_BUILD_ROOT%{_javadir}/hibernate3/hibernate-ehcache-3.jar
%endif
+# on Fedora 19 some jars are named differently
+%if 0%{?fedora} && 0%{?fedora} > 18
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+ln -s -f %{_javadir}/apache-commons-validator.jar $RPM_BUILD_ROOT%{_javadir}/commons-validator.jar
+ln -s -f %{_javadir}/mchange-commons-java.jar $RPM_BUILD_ROOT%{_javadir}/mchange-commons.jar
+%endif
+
%if 0%{?rhel} && 0%{?rhel} < 6
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat5
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/localhost/
@@ -646,6 +651,10 @@ fi
%{_javadir}/hibernate3/hibernate-c3p0-3.jar
%{_javadir}/hibernate3/hibernate-ehcache-3.jar
%endif
+%if 0%{?fedora} && 0%{?fedora} > 18
+%{_javadir}/commons-validator.jar
+%{_javadir}/mchange-commons.jar
+%endif
%{jardir}/jaf.jar
%{jardir}/javamail.jar
%{jardir}/jcommon.jar
10 years, 11 months
Changes to 'refs/tags/cobbler20-2.0.11-20'
by Tomáš Kašpárek
Tag 'cobbler20-2.0.11-20' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-05 08:44 +0000
Tagging package [cobbler20] version [2.0.11-20] in directory [spec-tree/cobbler20/].
Changes since spacewalk-java-1.10.118-1:
Tomas Kasparek (2):
polishing cobbler20 dependencies for fedora19
Automatic commit of package [cobbler20] minor release [2.0.11-20].
---
rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
---
10 years, 11 months
rel-eng/packages spec-tree/cobbler20
by Tomáš Kašpárek
rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 045bee6cac028dff45df1ccfae92b3239af4c9a6
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 5 10:44:48 2013 +0200
Automatic commit of package [cobbler20] minor release [2.0.11-20].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index 630d435..426d8e0 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-19 spec-tree/cobbler20/
+2.0.11-20 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 751b6af..40db059 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 19%{?dist}
+Release: 20%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
@@ -460,6 +460,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Fri Jul 05 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.11-20
+- polishing cobbler20 dependencies for fedora19
+
* Wed Jul 03 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.11-19
- make cobbler20 build-able on F19
- replace legacy name of Tagger with new one
10 years, 11 months
spec-tree/cobbler20
by Tomáš Kašpárek
spec-tree/cobbler20/cobbler20.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit c7033c737730d5324f3a14268ce98f2eea49c473
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 5 10:43:40 2013 +0200
polishing cobbler20 dependencies for fedora19
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 413ba53..751b6af 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -32,9 +32,13 @@ Requires: tftp-server
Requires: mod_wsgi
Requires: createrepo
-%if 0%{?fedora} >= 11
+%if 0%{?fedora}
+%if 0%{?fedora} >= 19
+Requires: fence-agents-all
+%else
Requires: fence-agents
%endif
+%endif
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: genisoimage
%else
10 years, 11 months