backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2460e914394faa23d1f4441a4be98fcd39f50d35
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:56:34 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.10-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index f770262..773bab7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.9
+Version: 1.9.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.10-1
+- 877451 - read the repo config from yumbase
+- 877451 - correct the proxy configuration logic
+
* Thu Nov 22 2012 Jan Pazdziora 1.9.9-1
- 877451 - correct parsing of main and channel's settings
- 877451 - add missing and
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index ecd88a8..285093d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.9-1 backend/
+1.9.10-1 backend/
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.9.8-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.9.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:55 +0000
Tagging package [spacewalk-schema] version [1.9.8-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-1.9.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.9.8-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4a5f2e8c634b10ce47e77eebf4c4d9779e6d0d64
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:55:54 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.9.8-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 7d9e073..69ac19e 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.9.7-1 schema/spacewalk/
+1.9.8-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 84ffaba..1803a8d 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.9.7
+Version: 1.9.8
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -68,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.8-1
+- New timezones for RHEL 7
+- New installation type: RHEL 7
+
* Tue Nov 06 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.7-1
- 1.9 upgrade scripts go to the spacewalk-schema-1.8-to-spacewalk-schema-1.9
dir
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-1.9.1-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.9.1-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:54 +0000
Tagging package [spacewalk-setup] version [1.9.1-1] in directory [spacewalk/setup/].
Changes since dwr-3.0rc2-2:
Jan Pazdziora (5):
Stop repeated dir/file concatenation.
Prefer three-parameter open.
Allow tomcat config file without number.
Do not use Java keywords.
Automatic commit of package [spacewalk-setup] release [1.9.1-1].
Tomas Lestach (1):
add dwr to spacewalk-server comps
---
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 18 +--
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 6 -
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1
rel-eng/packages/spacewalk-setup | 2
spacewalk/setup/bin/spacewalk-setup | 50 +++++-----
spacewalk/setup/spacewalk-setup.spec | 7 +
12 files changed, 53 insertions(+), 40 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/setup
by Jan Pazdziora
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d038c486e7ed990e85dec7ef9b9ae94c5850fa00
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:54:21 2012 +0100
Automatic commit of package [spacewalk-setup] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index fba78ed..f8586d7 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.24-1 spacewalk/setup/
+1.9.1-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index f52023c..72069e2 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -110,6 +110,11 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.1-1
+- Allow tomcat config file without number.
+- Prefer three-parameter open.
+- Stop repeated dir/file concatenation.
+
* Wed Oct 31 2012 Jan Pazdziora 1.8.24-1
- Advertise the www.spacewalkproject.org.
10 years, 10 months
4 commits - java/code spacewalk/setup
by Jan Pazdziora
java/code/webapp/WEB-INF/pages/activationkeys/list.jsp | 18 +--
java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp | 2
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf | 6 -
java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp | 2
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2
spacewalk/setup/bin/spacewalk-setup | 50 +++++-----
6 files changed, 42 insertions(+), 38 deletions(-)
New commits:
commit f5ed791bb25c12a614f261f70c61d5d982de1849
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 20 13:40:50 2012 +0100
Do not use Java keywords.
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
index c000b42..8e298c8 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/list.jsp
@@ -30,7 +30,7 @@
<bean:message key="activation-keys.jsp.universal-default-text"/>
</p>
<c:choose>
- <c:when test="${not empty requestScope.default}">
+ <c:when test="${not empty requestScope['default']}">
<table class="details">
<tr>
<th>
@@ -38,12 +38,12 @@
</th>
<td>
<c:choose>
- <c:when test="${requestScope.default.note != null}">
- <a href="/rhn/activationkeys/Edit.do?tid=${requestScope.default.id}">
- <c:out value="${requestScope.default.note}"/></a>
+ <c:when test="${requestScope['default'].note != null}">
+ <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}">
+ <c:out value="${requestScope['default'].note}"/></a>
</c:when>
<c:otherwise>
- <a href="/rhn/activationkeys/Edit.do?tid=${requestScope.default.id}">
+ <a href="/rhn/activationkeys/Edit.do?tid=${requestScope['default'].id}">
<bean:message key="kickstart.activationkeys.jsp.description.none"/></a>
</c:otherwise>
</c:choose>
@@ -57,7 +57,7 @@
<bean:message key="kickstart.activationkeys.jsp.key"/>
</th>
<td>
- <c:out value="${requestScope.default.token}"/>
+ <c:out value="${requestScope['default'].token}"/>
</td>
</tr>
@@ -67,8 +67,8 @@
</th>
<td>
<c:choose>
- <c:when test="${requestScope.default.usageLimit != null}">
- <c:out value="${requestScope.default.usageLimit}"/>
+ <c:when test="${requestScope['default'].usageLimit != null}">
+ <c:out value="${requestScope['default'].usageLimit}"/>
</c:when>
<c:otherwise>
<bean:message key="kickstart.activationkeys.jsp.nousagelimit"/>
@@ -83,7 +83,7 @@
</th>
<td>
<c:choose>
- <c:when test="${not requestScope.default.disabled}">
+ <c:when test="${not requestScope['default'].disabled}">
<bean:message key="Enabled"/>
</c:when>
<c:otherwise>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
index 61b4fa9..01813b8 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/repo/repos.jsp
@@ -14,7 +14,7 @@
</rhn:toolbar>
<div class="page-summary">
<p><bean:message key="repos.jsp.summary"/></p>
-<c:if test="${not empty requestScope.default}">
+<c:if test="${not empty requestScope['default']}">
<rhn:note key = "repos.jsp.note.default"/>
</c:if>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
index baaeddd..093d3d9 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/profile-sync.jspf
@@ -27,10 +27,10 @@
<select name="targetProfile" id="syncPackageSelect"
<c:if test="${form.targetProfileType ne 'package' or empty form.syncPackages}">disabled="true"</c:if>
>
- <c:forEach var="package" items="${form.syncPackages}">
+ <c:forEach var="packagex" items="${form.syncPackages}">
<option
- <c:if test="${package.id == form.targetProfile}">selected="selected"</c:if>
- value='${package.id}'>${package.name}</option>
+ <c:if test="${packagex.id == form.targetProfile}">selected="selected"</c:if>
+ value='${packagex.id}'>${packagex.name}</option>
</c:forEach>
</select>
<br /><br />
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
index a0b6c7d..6aee44d 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/cobbler/snippets.jsp
@@ -16,7 +16,7 @@
renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
<div class="page-summary">
<p><bean:message key="snippets.jsp.summary"/></p>
-<c:if test="${not empty requestScope.default}">
+<c:if test="${not empty requestScope['default']}">
<rhn:note key = "snippets.jsp.note.default"/>
</c:if>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index 2c955c4..69f59f9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -44,7 +44,7 @@
<select name="type">
<c:forEach items="${combo}" var="item">
<option id="${item.id}"
- <c:if test="${item.default}"> selected</c:if>
+ <c:if test="${item['default']}"> selected</c:if>
> <bean:message key="${item.name}"/>
</option>
</c:forEach>
commit 95df4d67c21ce8daf6100ee37923877c2a30bd7c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 14:06:12 2012 +0100
Allow tomcat config file without number.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 6eaf96d..e0ac463 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -525,14 +525,14 @@ sub setup_tomcat {
my $answers = shift;
my ($tomcatconf_content_orig, $tomcatconf_content);
- my $which_tomcat = qx{rpm -q --requires spacewalk-java};
- my ($tomcatX) = ($which_tomcat =~ m/\b(tomcat\d)\b/m);
- my $tomcatdir = "/etc/$tomcatX";
- my $tomcatconf = "$tomcatX.conf";
- my $webxml = "web.xml";
- my $tomcatfile = "$tomcatdir/$tomcatconf";
+ my @tomcat_confs = grep { -f $_ } glob("/etc/tomcat*/tomcat*.conf");
+ if (@tomcat_confs < 1) {
+ die "Couldn't find tomcat config file (/etc/tomcat*/tomcat*.conf).\n";
+ } elsif (@tomcat_confs > 1) {
+ die "Multiple tomcat config files found:\n @tomcat_confs\nNot sure which tomcat to use.\n";
+ }
- die "$tomcatfile does not exist.\n" unless (-f $tomcatfile);
+ my $tomcatfile = $tomcat_confs[0];
{
open FILE, '<', $tomcatfile
@@ -558,7 +558,7 @@ sub setup_tomcat {
}
if ($tomcatconf_content ne $tomcatconf_content_orig) {
- Spacewalk::Setup::backup_file($tomcatdir, $tomcatconf);
+ Spacewalk::Setup::backup_file($tomcatfile =~ m!^(.+)/(.+)$!);
open FILE, '>', $tomcatfile
or die "Error opening [$tomcatfile]: $!\n";
@@ -567,6 +567,7 @@ sub setup_tomcat {
close FILE;
}
+ my ($tomcatdir) = ($tomcatfile =~ m!^(.+)/!);
my $serverxmlfile = "$tomcatdir/server.xml";
{
local $/ = undef;
@@ -594,7 +595,8 @@ sub setup_tomcat {
my $command = "patch --silent --directory=$tomcatdir --forward -p1 --input=$web_patch";
system($command." --dry-run");
if (not $?){
- Spacewalk::Setup::backup_file($tomcatdir, $webxml);
+ Spacewalk::Setup::backup_file($tomcatdir, 'web.xml');
+
system($command);
}
return;
commit f4197ea73035b968b2fc96268015b1d21d3dd29b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 14:16:32 2012 +0100
Prefer three-parameter open.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index e75a973..6eaf96d 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -535,7 +535,7 @@ sub setup_tomcat {
die "$tomcatfile does not exist.\n" unless (-f $tomcatfile);
{
- open FILE, $tomcatfile
+ open FILE, '<', $tomcatfile
or die "Error opening [$tomcatfile]: $!\n";
local $/ = undef;
$tomcatconf_content = <FILE>;
@@ -544,7 +544,7 @@ sub setup_tomcat {
}
for my $file (glob Spacewalk::Setup::SHARED_DIR . '/tomcatX.conf.[0-9]') {
- open FILE, $file or die "Error reading [$file]: $!\n";
+ open FILE, '<', $file or die "Error reading [$file]: $!\n";
my $regexp = <FILE>;
chomp $regexp;
@@ -560,7 +560,7 @@ sub setup_tomcat {
if ($tomcatconf_content ne $tomcatconf_content_orig) {
Spacewalk::Setup::backup_file($tomcatdir, $tomcatconf);
- open FILE, ">$tomcatfile"
+ open FILE, '>', $tomcatfile
or die "Error opening [$tomcatfile]: $!\n";
chmod 0644, $tomcatfile;
print FILE $tomcatconf_content;
@@ -571,7 +571,7 @@ sub setup_tomcat {
{
local $/ = undef;
local *FILE;
- open FILE, $serverxmlfile
+ open FILE, '<', $serverxmlfile
or die "Error opening [$serverxmlfile]: $!\n";
my $serverxml_content_orig = <FILE>;
close FILE;
@@ -582,7 +582,7 @@ sub setup_tomcat {
if ($serverxml_content ne $serverxml_content_orig) {
Spacewalk::Setup::backup_file($serverxmlfile =~ m!^(.+)/(.+)$!);
- open FILE, ">$serverxmlfile"
+ open FILE, '>', $serverxmlfile
or die "Error opening [$serverxmlfile]: $!\n";
chmod 0644, $serverxmlfile;
print FILE $serverxml_content;
commit 616d23233fbc73eb002f42e30c8c582c9028c67b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 14:15:33 2012 +0100
Stop repeated dir/file concatenation.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 876cada..e75a973 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -529,13 +529,14 @@ sub setup_tomcat {
my ($tomcatX) = ($which_tomcat =~ m/\b(tomcat\d)\b/m);
my $tomcatdir = "/etc/$tomcatX";
my $tomcatconf = "$tomcatX.conf";
- my $serverxml = "server.xml";
my $webxml = "web.xml";
- die "$tomcatdir/$tomcatconf does not exist.\n" unless (-f "$tomcatdir/$tomcatconf");
+ my $tomcatfile = "$tomcatdir/$tomcatconf";
+
+ die "$tomcatfile does not exist.\n" unless (-f $tomcatfile);
{
- open FILE, "$tomcatdir/$tomcatconf"
- or die "Error opening [$tomcatdir/$tomcatconf]: $!\n";
+ open FILE, $tomcatfile
+ or die "Error opening [$tomcatfile]: $!\n";
local $/ = undef;
$tomcatconf_content = <FILE>;
$tomcatconf_content_orig = $tomcatconf_content;
@@ -559,30 +560,31 @@ sub setup_tomcat {
if ($tomcatconf_content ne $tomcatconf_content_orig) {
Spacewalk::Setup::backup_file($tomcatdir, $tomcatconf);
- open FILE, ">$tomcatdir/$tomcatconf"
- or die "Error opening [$tomcatdir/$tomcatconf]: $!\n";
- chmod 0644, "$tomcatdir/$tomcatconf";
+ open FILE, ">$tomcatfile"
+ or die "Error opening [$tomcatfile]: $!\n";
+ chmod 0644, $tomcatfile;
print FILE $tomcatconf_content;
close FILE;
}
+ my $serverxmlfile = "$tomcatdir/server.xml";
{
local $/ = undef;
local *FILE;
- open FILE, "$tomcatdir/$serverxml"
- or die "Error opening $tomcatdir/$serverxml: $!\n";
+ open FILE, $serverxmlfile
+ or die "Error opening [$serverxmlfile]: $!\n";
my $serverxml_content_orig = <FILE>;
close FILE;
- my $template = Spacewalk::Setup::SHARED_DIR . "/$serverxml.xsl";
- my $serverxml_content = qx{/usr/bin/xsltproc $template $tomcatdir/$serverxml};
+ my $template = Spacewalk::Setup::SHARED_DIR . '/server.xml.xsl';
+ my $serverxml_content = qx{/usr/bin/xsltproc $template $serverxmlfile};
die "There was an error running xsltproc\n" if $?;
if ($serverxml_content ne $serverxml_content_orig) {
- Spacewalk::Setup::backup_file($tomcatdir, $serverxml);
+ Spacewalk::Setup::backup_file($serverxmlfile =~ m!^(.+)/(.+)$!);
- open FILE, ">$tomcatdir/$serverxml"
- or die "Error opening [$tomcatdir/$serverxml]: $!\n";
- chmod 0644, "$tomcatdir/$serverxml";
+ open FILE, ">$serverxmlfile"
+ or die "Error opening [$serverxmlfile]: $!\n";
+ chmod 0644, $serverxmlfile;
print FILE $serverxml_content;
close FILE;
}
10 years, 10 months
rel-eng/comps
by Tomas Lestach
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 +
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 +
4 files changed, 4 insertions(+)
New commits:
commit 2ff904f529c4871231153e778634d9102aafd46e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 30 11:03:08 2012 +0100
add dwr to spacewalk-server comps
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index f0aba77..cfdd681 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -23,6 +23,7 @@
<packagereq type="default">cobbler20</packagereq>
<packagereq type="default">cobbler-epel</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index 432d0b86..f45c630 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -23,6 +23,7 @@
<packagereq type="default">cobbler20</packagereq>
<packagereq type="default">cobbler-epel</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 2938cad..2ddfbb4 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -37,6 +37,7 @@
<packagereq type="default">dom4j-demo</packagereq>
<packagereq type="default">dom4j-manual</packagereq>
<packagereq type="default">dom4j-repolib</packagereq>
+ <packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">hibernate3</packagereq>
<packagereq type="default">hibernate3-manual</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 9745964..71d3a52 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -23,6 +23,7 @@
<packagereq type="default">cobbler20</packagereq>
<packagereq type="default">cobbler-epel</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">dwr</packagereq>
<packagereq type="default">eventReceivers</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
10 years, 10 months
Changes to 'refs/tags/dwr-3.0rc2-2'
by Tomas Lestach
Tag 'dwr-3.0rc2-2' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-29 16:27 +0000
Tagging package [dwr] version [3.0rc2-2] in directory [spec-tree/dwr/].
Changes since dwr-3.0rc2-1:
Tomas Lestach (3):
define BuildRoot for dwr.spec
define NoTgzBuilder for dwr
Automatic commit of package [dwr] minor release [3.0rc2-2].
---
rel-eng/packages/dwr | 2 +-
spec-tree/dwr/build.py.props | 2 +-
spec-tree/dwr/dwr.spec | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
---
10 years, 10 months
3 commits - rel-eng/packages spec-tree/dwr
by Tomas Lestach
rel-eng/packages/dwr | 2 +-
spec-tree/dwr/build.py.props | 2 +-
spec-tree/dwr/dwr.spec | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 067ee6df44cd20290bc704391fbedd0e2468895e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 17:27:21 2012 +0100
Automatic commit of package [dwr] minor release [3.0rc2-2].
diff --git a/rel-eng/packages/dwr b/rel-eng/packages/dwr
index 1c8f6e5..2b79811 100644
--- a/rel-eng/packages/dwr
+++ b/rel-eng/packages/dwr
@@ -1 +1 @@
-3.0rc2-1 spec-tree/dwr/
+3.0rc2-2 spec-tree/dwr/
diff --git a/spec-tree/dwr/dwr.spec b/spec-tree/dwr/dwr.spec
index 739a512..7642b90 100644
--- a/spec-tree/dwr/dwr.spec
+++ b/spec-tree/dwr/dwr.spec
@@ -1,6 +1,6 @@
Name: dwr
Version: 3.0rc2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Direct Web Remoting
Group: Development/Libraries/Java
License: Apache Software License v2
@@ -31,6 +31,10 @@ install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{versi
%changelog
+* Thu Nov 29 2012 Tomas Lestach <tlestach(a)redhat.com> 3.0rc2-2
+- define NoTgzBuilder for dwr
+- define BuildRoot for dwr.spec
+
* Thu Nov 29 2012 Tomas Lestach <tlestach(a)redhat.com> 3.0rc2-1
- initial dwr build
commit e7c7f2de2ed47f08d6fdba78573d22fc032591b1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 17:21:29 2012 +0100
define NoTgzBuilder for dwr
diff --git a/spec-tree/dwr/build.py.props b/spec-tree/dwr/build.py.props
index ccc90ea..ebbe79a 100644
--- a/spec-tree/dwr/build.py.props
+++ b/spec-tree/dwr/build.py.props
@@ -1,3 +1,3 @@
[buildconfig]
tagger = spacewalk.releng.tagger.ReleaseTagger
-
+builder = spacewalkx.builderx.NoTgzBuilder
commit 6bb5a91b2859d2cd0c29b9d8673e7ffdcd0af84b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 14:28:11 2012 +0100
define BuildRoot for dwr.spec
diff --git a/spec-tree/dwr/dwr.spec b/spec-tree/dwr/dwr.spec
index 48f196a..739a512 100644
--- a/spec-tree/dwr/dwr.spec
+++ b/spec-tree/dwr/dwr.spec
@@ -7,6 +7,7 @@ License: Apache Software License v2
URL: http://directwebremoting.org
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires: java
10 years, 10 months
Changes to 'refs/tags/dwr-3.0rc2-1'
by Tomas Lestach
Tag 'dwr-3.0rc2-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-29 13:00 +0000
Tagging package [dwr] version [3.0rc2-1] in directory [spec-tree/dwr/].
Changes since spacewalk-java-1.9.23-1:
Tomas Kasparek (1):
OrgSoftwareSubscribtions CSV export
Tomas Lestach (4):
removing @Override annotation from methods that aren't overriden
851942 - copy GPG information from the original channel within
initial dwr build
Automatic commit of package [dwr] minor release [3.0rc2-1].
---
java/code/src/com/redhat/rhn/common/conf/Config.java | 1
java/code/src/com/redhat/rhn/common/filediff/RhnHtmlDiffWriter.java | 5
java/code/src/com/redhat/rhn/common/filediff/RhnPatchDiffWriter.java | 5
java/code/src/com/redhat/rhn/common/finder/FileFinder.java | 2
java/code/src/com/redhat/rhn/common/finder/JarFinder.java | 2
java/code/src/com/redhat/rhn/domain/user/UserFactory.java | 1
java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 18 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 56 ++++++----
java/code/webapp/WEB-INF/pages/admin/multiorg/orgsoftwaresubs.jsp | 8 -
rel-eng/packages/dwr | 1
spec-tree/dwr/build.py.props | 3
spec-tree/dwr/dwr.spec | 36 ++++++
13 files changed, 100 insertions(+), 41 deletions(-)
---
10 years, 10 months