Changes to 'refs/tags/spacewalk-java-0.7.24-1'
by Tomas Lestach
Tag 'spacewalk-java-0.7.24-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-12-02 14:09 +0000
Tagging package [spacewalk-java] version [0.7.24-1] in directory [java/].
Changes since spacewalk-search-0.7.3-1:
Tomas Lestach (9):
fixing ISE when adding Red Hat Errata to custom channel
fixing ISE when cloning channel
543347 - Security errata with enhancement advisory icons
checking return value of channel.getChecksum()
fixing checksum empty string in the repo metadata
537094 - yum list-sec CVE's on cloned channels doesn't work
checksyle issue
Automatic commit of package [spacewalk-web] release [0.7.8-1].
Automatic commit of package [spacewalk-java] release [0.7.24-1].
---
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 6 ++--
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 2 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 5 ++-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 7 ++++-
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 14 +++-------
java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 2 -
java/spacewalk-java.spec | 12 +++++++-
rel-eng/packages/spacewalk-java | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/ErrataEditor.pm | 11 +++++++
web/spacewalk-web.spec | 6 +++-
13 files changed, 50 insertions(+), 23 deletions(-)
---
14 years, 4 months
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
java/spacewalk-java.spec | 12 +++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 69fccb5bcffcb341fc347b07ae101f93aaa76e9a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 15:09:38 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0092b18..ac719d1 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.23
+Version: 0.7.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 02 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.24-1
+- 537094 - yum list-sec CVE's on cloned channels doesn't work
+ (tlestach(a)redhat.com)
+- fixing checksum empty string in the repo metadata (tlestach(a)redhat.com)
+- checking return value of channel.getChecksum() (tlestach(a)redhat.com)
+- 543347 - Security errata with enhancement advisory icons
+ (tlestach(a)redhat.com)
+- fixing ISE when cloning channel (tlestach(a)redhat.com)
+- fixing ISE when adding Red Hat Errata to custom channel (tlestach(a)redhat.com)
+
* Tue Dec 1 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.23-1
- 542830 - fixing three api calls that were using very inefficient queries to use the same queries that were used in sat 5.2 (jsherril(a)redhat.com)
- converting old hibernate max in clause limit fix to use new fix (jsherril(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index acd91aa..66cdb71 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.23-1 java/
+0.7.24-1 java/
commit 92ca81d4eb4d0b1f8f37a65c021adb1def94ab68
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 15:08:57 2009 +0100
Automatic commit of package [spacewalk-web] release [0.7.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8d36807..cef8719 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.7-1 web/
+0.7.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 465a503..6ee6ac4 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.7
+Version: 0.7.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Dec 02 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.8-1
+- 537094 - yum list-sec CVE's on cloned channels doesn't work
+ (tlestach(a)redhat.com)
+
* Mon Nov 30 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.7-1
- add variable web.chat_enabled to config file
14 years, 4 months
3 commits - java/code web/modules
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml | 2 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java | 2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 14 +++-------
web/modules/rhn/RHN/DB/ErrataEditor.pm | 11 +++++++
5 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 6e11c28ffdb97af10ff255cbd3c15ffda285d2bd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 15:02:14 2009 +0100
checksyle issue
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
index 9ec56a4..818c07a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
@@ -94,9 +94,9 @@ public class ConfirmErrataAction extends RhnListAction {
Long sourceCid = null;
Channel srcChan = null;
- String sel_channel = request.getParameter(SELECTED_CHANNEL);
- if ((sel_channel != null) && (sel_channel != "")) {
- sourceCid = Long.parseLong(sel_channel);
+ String selChannel = request.getParameter(SELECTED_CHANNEL);
+ if ((selChannel != null) && (selChannel != "")) {
+ sourceCid = Long.parseLong(selChannel);
srcChan = ChannelFactory.lookupByIdAndUser(sourceCid, user);
}
commit caff25c7259f6244e04c85e45bff5f5d148e1244
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 12:01:34 2009 +0100
537094 - yum list-sec CVE's on cloned channels doesn't work
contains perl and java changes
diff --git a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
index ddf7c66..b305f66 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/errata/impl/PublishedErrata.hbm.xml
@@ -46,7 +46,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<one-to-many
class="com.redhat.rhn.domain.errata.impl.PublishedBug"/>
</set>
- <set name="cves" lazy="true" inverse="true" cascade="all-delete-orphan" table="rhnErrataCve">
+ <set name="cves" lazy="true" cascade="all-delete-orphan" table="rhnErrataCve">
<key column="errata_id"/>
<many-to-many column="cve_id" class="com.redhat.rhn.domain.errata.Cve" />
</set>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
index 94af7e3..f18f942 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/PublishErrataHelper.java
@@ -85,8 +85,8 @@ public class PublishErrataHelper {
clone.setLocallyModified(original.getLocallyModified());
clone.setLastModified(original.getLastModified());
clone.setOrg(org);
+ clone.getCves().addAll(original.getCves());
-
clone.setPackages(new HashSet(original.getPackages()));
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 35f852e..f2ba79a 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -166,6 +166,17 @@ EOQ
$sth = $dbh->prepare($query);
$sth->execute_h(temp_eid => $temp_eid);
+ $query =<<EOQ;
+INSERT INTO rhnErrataCve
+ (errata_id, cve_id)
+ (SELECT ECL.id, EC.cve_id
+ FROM rhnErrataCVE EC, rhnErrataCloned ECL
+ WHERE ECL.original_id = EC.errata_id
+ AND ECL.id = :new_eid)
+EOQ
+ $sth = $dbh->prepare($query);
+ $sth->execute_h(new_eid => $new_eid);
+
my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $new_eid);
$errata->refresh_erratafiles();
commit af1cc6479fd162467a2c9b28858cd2123689b782
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 14:58:56 2009 +0100
fixing checksum empty string in the repo metadata
client wasn't able to get repo metada with "Error performing checksum"
+ removing one variable
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index 5bba05d..22c4f82 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -56,7 +56,6 @@ public class RepositoryWriter {
private String pathPrefix;
private String mountPoint;
private String checksumtype;
- private String checksumname = null;
/**
* Constructor takes in pathprefix and mountpoint
@@ -106,9 +105,6 @@ public class RepositoryWriter {
// Get compatible checksumType
this.checksumtype = channel.getChecksumType();
- if (channel.getChecksum() != null) {
- this.checksumname = channel.getChecksum().getDescription();
- }
log.info("Checksum Type Value" + this.checksumtype);
@@ -190,15 +186,15 @@ public class RepositoryWriter {
RepomdIndexData groupsData = loadCompsFile(channel);
//Set the type so yum can read and perform checksum
- primaryData.setType(this.checksumname);
- filelistsData.setType(this.checksumname);
- otherData.setType(this.checksumname);
+ primaryData.setType(this.checksumtype);
+ filelistsData.setType(this.checksumtype);
+ otherData.setType(this.checksumtype);
if (updateinfoData != null) {
- updateinfoData.setType(this.checksumname);
+ updateinfoData.setType(this.checksumtype);
}
if (groupsData != null) {
- groupsData.setType(this.checksumname);
+ groupsData.setType(this.checksumtype);
}
log.info("Primary xml's type" + primaryData.getType());
14 years, 4 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7c8a5a673b6388c11848a54b7790148a318f288f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 12:19:13 2009 +0100
checking return value of channel.getChecksum()
null as return value caused a NullPointerException in
com.redhat.rhn.taskomatic.task.ChannelRepodata (for cloned channels)
related to c51d755737a75b8e624f9983054f004008fe753e
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index a636567..27267cc 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -898,9 +898,9 @@ public class Channel extends BaseDomainHelper implements Comparable {
// IF its custom use the one set at channel creation time
if (toConsider.isCustom()) {
- String checksumOut = toConsider.getChecksum().getLabel();
- if (checksumOut != null) {
- return checksumOut;
+ ChecksumType checksumOut = toConsider.getChecksum();
+ if ((checksumOut != null) && (checksumOut.getLabel() != null)) {
+ return checksumOut.getLabel();
}
else {
// default to sha1 if its not available in the db
14 years, 4 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java | 5 +++--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 7 ++++++-
java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 2 +-
4 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 3ad8386ec640a41a3a2512b90c96c26ed9471008
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 10:52:14 2009 +0100
543347 - Security errata with enhancement advisory icons
displaying correct icons for Security Advisories
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
index 8a10eae..e7e801a 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/errataremove.jsp
@@ -45,7 +45,7 @@
<img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Security Advisory'}">
- <img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" />
+ <img src="/img/wrh-security.gif" alt="Security Advisory" title="Security Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Bug Fix Advisory'}">
<img src="/img/wrh-bug.gif" alt="Bug Fix Advisory" title="Bug Fix Advisory" />
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
index e0ff796..3f87ca3 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
@@ -45,7 +45,7 @@
<img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Security Advisory'}">
- <img src="/img/wrh-product.gif" alt="Product Enhancement Advisory" title="Product Enhancement Advisory" />
+ <img src="/img/wrh-security.gif" alt="Security Advisory" title="Security Advisory" />
</c:if>
<c:if test="${current.advisoryType == 'Bug Fix Advisory'}">
<img src="/img/wrh-bug.gif" alt="Bug Fix Advisory" title="Bug Fix Advisory" />
commit ef410a38c5a1b5196a4a41f5f943558f8fe1a2c5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 10:30:03 2009 +0100
fixing ISE when cloning channel
ISE on page rhn/channels/manage/Edit.do?cid=<cid>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
index 77e96e3..c0aaf2b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java
@@ -568,7 +568,12 @@ public class EditChannelAction extends RhnAction implements Listable {
form.set("maintainer_phone", c.getMaintainerPhone());
form.set("maintainer_email", c.getMaintainerEmail());
form.set("support_policy", c.getSupportPolicy());
- form.set("checksum", c.getChecksum().getLabel());
+ if (c.getChecksum() == null) {
+ form.set("checksum", null);
+ }
+ else {
+ form.set("checksum", c.getChecksum().getLabel());
+ }
if (c.isGloballySubscribable(ctx.getLoggedInUser().getOrg())) {
form.set("per_user_subscriptions", "all");
}
commit a6903f8d6192e1d68a25fcd051e42ce4fb8b7c85
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Dec 2 10:19:35 2009 +0100
fixing ISE when adding Red Hat Errata to custom channel
ISE on page rhn/channels/manage/errata/ConfirmErrataAdd.do?assoc_checked=on&cid=<cid>
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
index fe17f6e..9ec56a4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ConfirmErrataAction.java
@@ -94,8 +94,9 @@ public class ConfirmErrataAction extends RhnListAction {
Long sourceCid = null;
Channel srcChan = null;
- if (request.getParameter(SELECTED_CHANNEL) != "") {
- sourceCid = Long.parseLong(request.getParameter(SELECTED_CHANNEL));
+ String sel_channel = request.getParameter(SELECTED_CHANNEL);
+ if ((sel_channel != null) && (sel_channel != "")) {
+ sourceCid = Long.parseLong(sel_channel);
srcChan = ChannelFactory.lookupByIdAndUser(sourceCid, user);
}
14 years, 4 months
Changes to 'refs/tags/spacewalk-search-0.7.3-1'
by Miroslav Suchý
Tag 'spacewalk-search-0.7.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-02 10:13 +0000
Tagging package [spacewalk-search] version [0.7.3-1] in directory [search-server/].
Changes since spacewalk-java-0.7.23-1:
Miroslav Suchý (2):
add missing %
Automatic commit of package [spacewalk-search] release [0.7.3-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search.spec | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
---
14 years, 4 months
2 commits - rel-eng/packages search-server/spacewalk-search.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search.spec | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 585f7b202ce0cb633ae05ba575d0373bb2ca57ee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 2 11:13:23 2009 +0100
Automatic commit of package [spacewalk-search] release [0.7.3-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 17ff4d1..6149ae1 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-0.7.2-1 search-server/
+0.7.3-1 search-server/
diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-search.spec
index 0cae0ad..832197f 100644
--- a/search-server/spacewalk-search.spec
+++ b/search-server/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -112,7 +112,7 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
-* Tue Dec 1 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.2-1
+* Wed Dec 2 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.3-1
- 480342 - move init script from /etc/init.d to /etc/rc.d/init.d
* Wed Nov 25 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.1-1
commit 8c2af5b790b79fd70d510dda6b4e84b9643c2971
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 2 11:12:26 2009 +0100
add missing %
diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-search.spec
index f2504d7..0cae0ad 100644
--- a/search-server/spacewalk-search.spec
+++ b/search-server/spacewalk-search.spec
@@ -67,7 +67,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/indexes
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db
-install -d -m 755 $RPM_BUILD_ROOT{_initrddir}
+install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_var}/log/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/nutch
@@ -78,7 +78,7 @@ cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib
install -p -m 644 src/config/log4j.properties $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/classes/log4j.properties
install -p -m 644 src/config/etc/logrotate.d/rhn-search $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search
install -p -m 644 src/config/com/redhat/satellite/search/db/* $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/classes/com/redhat/satellite/search/db
-install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT{_initrddir}
+install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir}
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd
install -p -m 644 src/config/search/rhn_search.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search.conf
install -p -m 644 src/config/search/rhn_search_daemon.conf $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search_daemon.conf
@@ -104,7 +104,7 @@ fi
%{_prefix}/share/rhn/search/classes/log4j.properties
%{_prefix}/share/rhn/search/classes/com/*
%attr(755, root, root) %{_prefix}/share/rhn/search/indexes
-%attr(755, root, root) {_initrddir}/rhn-search
+%attr(755, root, root) %{_initrddir}/rhn-search
%attr(755, root, root) %{_bindir}/rhnsearchd
%dir %{_sysconfdir}/rhn/search/
%config(noreplace) %{_sysconfdir}/rhn/search/rhn_search.conf
14 years, 4 months
Changes to 'refs/tags/spacewalk-search-0.7.2-1'
by Miroslav Suchý
Tag 'spacewalk-search-0.7.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-01 08:41 +0000
Tagging package [spacewalk-search] version [0.7.2-1] in directory [search-server/].
Changes since rhnsd-4.5.16-1:
Miroslav Suchý (2):
480342 - move init script from /etc/init.d to /etc/rc.d/init.d
Automatic commit of package [spacewalk-search] release [0.7.2-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search.spec | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
---
14 years, 5 months
Changes to 'refs/tags/spacewalk-java-0.7.23-1'
by Miroslav Suchý
Tag 'spacewalk-java-0.7.23-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-01 16:03 +0000
Tagging package [spacewalk-java] version [0.7.23-1] in directory [java/].
Changes since oracle-selinux-0.1-23.13:
Joshua Roys (1):
Fix creating new config-managed symlinks
Miroslav Suchý (1):
Automatic commit of package [spacewalk-java] release [0.7.23-1].
---
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 20 +++++-----
java/spacewalk-java.spec | 5 +-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 14 insertions(+), 13 deletions(-)
---
14 years, 5 months
Changes to 'refs/tags/spacewalk-backend-0.7.18-1'
by Miroslav Suchý
Tag 'spacewalk-backend-0.7.18-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-01 10:54 +0000
Tagging package [spacewalk-backend] version [0.7.18-1] in directory [backend/].
Changes since rhnsd-4.5.16-1:
Miroslav Suchý (4):
480342 - move init script from /etc/init.d to /etc/rc.d/init.d
Automatic commit of package [spacewalk-search] release [0.7.2-1].
449167 - time.strptime can not handle None values
Automatic commit of package [spacewalk-backend] release [0.7.18-1].
---
backend/server/rhnServer/server_packages.py | 3 ++-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search.spec | 11 +++++++----
5 files changed, 15 insertions(+), 8 deletions(-)
---
14 years, 5 months