Changes to 'refs/tags/spacewalk-java-2.1.80-1'
by Jan Dobes
Tag 'spacewalk-java-2.1.80-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-11-21 16:21 +0000
Tagging package [spacewalk-java] version [2.1.80-1] in directory [java/].
Changes since nodejs-less-1.4.1-1.3:
Jan Dobes (3):
1021923 - allow deletion link on /rhn/systems/provisioning/preservation/PreservationListEdit.do
1009875 - changing order of operations
Automatic commit of package [spacewalk-java] release [2.1.80-1].
Michael Calmer (1):
replace UTF-8 space with normal space
---
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 12 +++++-----
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 2 -
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 2 -
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 +--
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 2 -
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 -
java/code/webapp/WEB-INF/struts-config.xml | 2 -
java/spacewalk-java.spec | 8 +++++-
rel-eng/packages/spacewalk-java | 2 -
21 files changed, 33 insertions(+), 27 deletions(-)
---
10 years
java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 9d9aa39019c986a2089173a5f4a35f98f4a02b16
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Nov 21 17:21:00 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.80-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e11c1b7..0653b25 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: 2.1.79
+Version: 2.1.80
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Nov 21 2013 Jan Dobes 2.1.80-1
+- 1009875 - changing order of operations
+- 1021923 - allow deletion link on
+ /rhn/systems/provisioning/preservation/PreservationListEdit.do
+- replace UTF-8 space with normal space
+
* Tue Nov 19 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.79-1
- 1001018 - escape kickstart script name on
/rhn/kickstart/KickstartScriptDelete.do page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4d73bd7..aacd952 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.79-1 java/
+2.1.80-1 java/
10 years
java/code
by Jan Dobes
java/code/src/com/redhat/rhn/manager/org/MigrationManager.java | 12 +++++-----
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 085e6b0eb88ea827f59f2dee44cbf433f93a09e4
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Nov 21 15:12:14 2013 +0100
1009875 - changing order of operations
diff --git a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
index 9b7949e..458a3a3 100644
--- a/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/org/MigrationManager.java
@@ -125,6 +125,12 @@ public class MigrationManager extends BaseManager {
throw new PermissionException(RoleFactory.ORG_ADMIN);
}
+ // Unsubscribe from all channels to change channel entitlements
+ UpdateChildChannelsCommand cmd = new UpdateChildChannelsCommand(user, server,
+ new ArrayList());
+ cmd.store();
+ SystemManager.unsubscribeServerFromChannel(server, server.getBaseChannel());
+
// Remove from all system groups:
ServerGroupManager manager = ServerGroupManager.getInstance();
for (ManagedServerGroup group : server.getManagedGroups()) {
@@ -174,12 +180,6 @@ public class MigrationManager extends BaseManager {
}
}
- // Unsubscribe from all channels to change channel entitlements
- UpdateChildChannelsCommand cmd = new UpdateChildChannelsCommand(user, server,
- new ArrayList());
- cmd.store();
- SystemManager.unsubscribeServerFromChannel(server, server.getBaseChannel());
-
SystemManager.removeAllServerEntitlements(server.getId());
}
10 years
java/code
by Jan Dobes
java/code/webapp/WEB-INF/struts-config.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a8b77a89bfa8ab5218f8c73bd8e01b2b40bd22a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Nov 21 11:09:25 2013 +0100
1021923 - allow deletion link on /rhn/systems/provisioning/preservation/PreservationListEdit.do
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index d49f3e7..f5f3637 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -6479,7 +6479,7 @@
type="com.redhat.rhn.frontend.action.systems.provisioning.PreservationListDeleteSubmitAction"
parameter="dispatch"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
- <set-property property="postRequired" value="true" />
+ <set-property property="postRequiredIfSubmitted" value="true" />
<set-property property="acls" value="org_entitlement(rhn_provisioning); user_role(config_admin)"/>
<forward name="default"
path="/systems/provisioning/preservation/PreservationList.do"/>
10 years
java/code
by StephenHerr
java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/erratalist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp | 2 +-
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 ++--
java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp | 2 +-
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/errata.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit cc290c62febc70c8aa665e49b5393fa8a01af601
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Nov 20 10:38:56 2013 -0500
replace UTF-8 space with normal space
diff --git a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
index a186edb..3c2052a 100644
--- a/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/errata/cloneconfirm.jsp
@@ -23,7 +23,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rhn:column>
<rhn:column header="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
index f6291af..ea2846d 100644
--- a/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/erratalist.jsp
@@ -35,7 +35,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
index 9d25e72..c94b317 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addcustomerrata.jsp
@@ -100,7 +100,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
index 3a36eb3..17b88a8 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/adderrataredhat.jsp
@@ -122,7 +122,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
index d44bc0e..d140851 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/confirmerrata.jsp
@@ -30,7 +30,7 @@
<td>${bug_count}</td>
</tr>
<tr>
- <th><i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <th><i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
Product Enhancement Advisory:
</th>
<td>${enhance_count}</td>
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 2e2bf43..c8d2abe 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/erratasync.jsp
@@ -42,7 +42,7 @@
headerclass="thin-column"
sortattr="advisoryType">
<c:if test="${current.advisoryType == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="Product Enhancement Advisory"></i>
+ <i class="fa spacewalk-icon-enhancement" title="Product Enhancement Advisory"></i>
</c:if>
<c:if test="${current.advisoryType == 'Security Advisory'}">
<i class="fa fa-lock" title="Security Advisory"></i>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
index 912e00b..2e129b0 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/errata-header.jspf
@@ -28,7 +28,7 @@
</rhn:toolbar>
</c:if>
<c:if test="${errata.productEnhancement}">
- <rhn:toolbar base="h1" icon=" spacewalk-icon-enhancement"
+ <rhn:toolbar base="h1" icon=" spacewalk-icon-enhancement"
iconAlt="errata-legend.jsp.enhancement"
helpUrl="/rhn/help/reference/en-US/s1-sm-errata.jsp">
<c:if test="${empty errata}">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
index 0f9248d..76ba418 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/erratadelete.jspf
@@ -8,7 +8,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rhn:column>
<rhn:column header="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
index 5dccb7a..012eb28 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/ownedlistdisplay.jspf
@@ -18,7 +18,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
</c:if>
</rl:column>
<rl:column headerkey="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
index 3d82a6c..81f3f52 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf
@@ -14,7 +14,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory'/>"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory'/>"></i>
</c:if>
</rl:column>
<rl:column headerkey="erratalist.jsp.advisory">
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
index 6b34395..6614d36 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/mostCriticalSystems.jsp
@@ -42,7 +42,7 @@
<rl:column headerkey="yourrhn.jsp.criticalsystems.enhancementerrata"
headerclass="row-2 text-align: center;">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='errata-legend.jsp.enhancement'/>"></i>${current.enhancementErrata}
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='errata-legend.jsp.enhancement'/>"></i>${current.enhancementErrata}
</rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 85629db..7a1f9db 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -88,7 +88,7 @@
</div>
<div class="checkbox">
<html:checkbox property="errata_type_enhancement">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
<bean:message key="erratalist.jsp.productenhancementadvisory"/>
</html:checkbox>
</div>
@@ -173,7 +173,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
index 50b43af..f147469 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/packageupgrade.jsp
@@ -59,7 +59,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
</c:if>
<c:if test="${current.advisoryType == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${current.advisoryId}">${current.advisory}</a><br/>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
index 60938bb..1cfec32 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
@@ -45,7 +45,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
index 9cce589..3ce0e73 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/upgradable.jsp
@@ -59,7 +59,7 @@
<i class="fa fa-bug" title="<bean:message key='erratalist.jsp.bugadvisory' />"></i>
</c:if>
<c:if test="${errata.type == 'Product Enhancement Advisory'}">
- <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
+ <i class="fa spacewalk-icon-enhancement" title="<bean:message key='erratalist.jsp.productenhancementadvisory' />"></i>
</c:if>
<a href="/rhn/errata/details/Details.do?eid=${errata.id}">${errata.advisory}</a><br/>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errata.jsp b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
index e3ad492..7678dbc 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errata.jsp
@@ -88,7 +88,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rl:column>
diff --git a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
index d234ea6..92e2eb4 100644
--- a/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/errataconfirm.jsp
@@ -37,7 +37,7 @@
<i class="fa fa-bug"></i>
</c:if>
<c:if test="${current.productEnhancement}">
- <i class="fa spacewalk-icon-enhancement"></i>
+ <i class="fa spacewalk-icon-enhancement"></i>
</c:if>
</rl:column>
10 years
Changes to 'refs/tags/nodejs-less-1.4.1-1.3'
by Michael Mraka
Tag 'nodejs-less-1.4.1-1.3' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-20 13:35 +0000
Tagging package [nodejs-less] version [1.4.1-1.3] in directory [spec-tree/nodejs-less/].
Changes since nodejs-less-1.4.1-1.2:
Michael Mraka (2):
simplejson has to be available in build time
Automatic commit of package [nodejs-less] minor release [1.4.1-1.3].
---
rel-eng/packages/nodejs-less | 2 +-
spec-tree/nodejs-less/nodejs-less.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years
2 commits - rel-eng/packages spec-tree/nodejs-less
by Michael Mraka
rel-eng/packages/nodejs-less | 2 +-
spec-tree/nodejs-less/nodejs-less.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 24f53e021df0868c4737759c10914a13ec0938fc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 14:35:30 2013 +0100
Automatic commit of package [nodejs-less] minor release [1.4.1-1.3].
diff --git a/rel-eng/packages/nodejs-less b/rel-eng/packages/nodejs-less
index 7c3a70c..e51848f 100644
--- a/rel-eng/packages/nodejs-less
+++ b/rel-eng/packages/nodejs-less
@@ -1 +1 @@
-1.4.1-1.2 spec-tree/nodejs-less/
+1.4.1-1.3 spec-tree/nodejs-less/
diff --git a/spec-tree/nodejs-less/nodejs-less.spec b/spec-tree/nodejs-less/nodejs-less.spec
index 9df194c..bd8f060 100644
--- a/spec-tree/nodejs-less/nodejs-less.spec
+++ b/spec-tree/nodejs-less/nodejs-less.spec
@@ -2,7 +2,7 @@
Name: nodejs-less
Version: 1.4.1
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
Summary: Less.js The dynamic stylesheet language
Group : Unspecified
@@ -71,6 +71,9 @@ ln -s %{nodejs_sitelib}/less/bin/lessc \
%changelog
+* Wed Nov 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1.3
+- simplejson has to be available in build time
+
* Wed Nov 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1.2
- packaging changes for RHEL5
commit 5d302b65af7fa624a0f04725c960d46b22782255
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 14:34:05 2013 +0100
simplejson has to be available in build time
addressing
+ /usr/lib/rpm/nodejs-fixdep ycssmin '~1.0.1'
Traceback (most recent call last):
File "/usr/lib/rpm/nodejs-fixdep", line 25, in ?
import simplejson as json
ImportError: No module named simplejson
diff --git a/spec-tree/nodejs-less/nodejs-less.spec b/spec-tree/nodejs-less/nodejs-less.spec
index 41401f0..9df194c 100644
--- a/spec-tree/nodejs-less/nodejs-less.spec
+++ b/spec-tree/nodejs-less/nodejs-less.spec
@@ -19,6 +19,7 @@ Patch0001: 0001-Require-include-files-from-the-default-location.patch
BuildArch: noarch
BuildRequires: nodejs-devel
+BuildRequires: python-simplejson
Requires: nodejs
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
10 years
Changes to 'refs/tags/nodejs-less-1.4.1-1.2'
by Michael Mraka
Tag 'nodejs-less-1.4.1-1.2' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-20 12:48 +0000
Tagging package [nodejs-less] version [1.4.1-1.2] in directory [spec-tree/nodejs-less/].
Changes since nodejs-packaging-4-1.3:
Michael Mraka (1):
Automatic commit of package [nodejs-less] minor release [1.4.1-1.2].
---
rel-eng/packages/nodejs-less | 2 +-
spec-tree/nodejs-less/nodejs-less.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years
rel-eng/packages spec-tree/nodejs-less
by Michael Mraka
rel-eng/packages/nodejs-less | 2 +-
spec-tree/nodejs-less/nodejs-less.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4855d368926a50f15438e7368cfd500ec27dad5f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 13:48:34 2013 +0100
Automatic commit of package [nodejs-less] minor release [1.4.1-1.2].
diff --git a/rel-eng/packages/nodejs-less b/rel-eng/packages/nodejs-less
index 7f759e6..7c3a70c 100644
--- a/rel-eng/packages/nodejs-less
+++ b/rel-eng/packages/nodejs-less
@@ -1 +1 @@
-1.4.1-1.1 spec-tree/nodejs-less/
+1.4.1-1.2 spec-tree/nodejs-less/
diff --git a/spec-tree/nodejs-less/nodejs-less.spec b/spec-tree/nodejs-less/nodejs-less.spec
index f548a7d..41401f0 100644
--- a/spec-tree/nodejs-less/nodejs-less.spec
+++ b/spec-tree/nodejs-less/nodejs-less.spec
@@ -2,7 +2,7 @@
Name: nodejs-less
Version: 1.4.1
-Release: 1.1%{?dist}
+Release: 1.2%{?dist}
Summary: Less.js The dynamic stylesheet language
Group : Unspecified
@@ -70,6 +70,9 @@ ln -s %{nodejs_sitelib}/less/bin/lessc \
%changelog
+* Wed Nov 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1.2
+- packaging changes for RHEL5
+
* Fri Nov 15 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.4.1-1.1
- koji build needs Group specified
10 years
Changes to 'refs/tags/nodejs-packaging-4-1.3'
by Michael Mraka
Tag 'nodejs-packaging-4-1.3' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-11-20 12:46 +0000
Tagging package [nodejs-packaging] version [4-1.3] in directory [spec-tree/nodejs-packaging/].
Changes since nodejs-packaging-4-1.2:
Michael Mraka (3):
packaging changes for RHEL5
more python 2.4 fixes
Automatic commit of package [nodejs-packaging] minor release [4-1.3].
---
rel-eng/packages/nodejs-packaging | 2 -
spec-tree/nodejs-less/nodejs-less.spec | 3 ++
spec-tree/nodejs-packaging/nodejs-packaging-python24.patch | 14 ++++++++++++-
spec-tree/nodejs-packaging/nodejs-packaging.spec | 5 +++-
4 files changed, 21 insertions(+), 3 deletions(-)
---
10 years