java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java | 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3ca2eb76dd09a312d7c3eeb2db60c42c9d5aedc4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 17:19:14 2013 +0100
906345 - reuse the ssm.server.delete.operationname message
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
index ed72dc9..e1c7183 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmDeleteServersAction.java
@@ -29,7 +29,7 @@ import java.util.List;
* @version $Revision$
*/
public class SsmDeleteServersAction extends AbstractDatabaseAction {
- public static final String OPERATION_NAME = "Server Delete";
+ public static final String OPERATION_NAME = "ssm.server.delete.operationname";
/** {@inheritDoc} */
protected void doExecute(EventMessage msg) {
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
index b365024..af5a8f3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java
@@ -20,6 +20,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.WriteMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.action.Action;
import com.redhat.rhn.domain.action.ActionFactory;
import com.redhat.rhn.domain.action.script.ScriptActionDetails;
@@ -742,7 +743,8 @@ public class SystemHandlerTest extends BaseHandlerTestCase {
List<OperationDetailsDto> ops = SsmOperationManager.allOperations(admin);
for (OperationDetailsDto op : ops) {
- assertEquals(op.getDescription(), SsmDeleteServersAction.OPERATION_NAME);
+ assertEquals(op.getDescription(), LocalizationService.getInstance().
+ getMessage(SsmDeleteServersAction.OPERATION_NAME));
}
}
10 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.9.55-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.55-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-01-31 15:31 +0000
Tagging package [spacewalk-java] version [1.9.55-1] in directory [java/].
Changes since spacewalk-config-1.9.3-1:
Jan Pazdziora (2):
Use the existing _clean_cache helper method.
Make clear_ssl_cache actually do the cleaning.
Tomas Lestach (4):
896015 - we need to set elaboration params anyway
906345 - localize operation descriptions
906345 - undo delete 'Server Delete' string
Automatic commit of package [spacewalk-java] release [1.9.55-1].
---
backend/satellite_tools/repo_plugins/yum_src.py | 6 ++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 10 +++++-----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
16 files changed, 29 insertions(+), 22 deletions(-)
---
10 years, 4 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 49854c015773f54c0907b7538b6fc966b647a8a8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 16:31:50 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.55-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eb61de2..6d71dde 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.9.54
+Version: 1.9.55
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 31 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.55-1
+- 906345 - undo delete 'Server Delete' string
+- 906345 - localize operation descriptions
+- 896015 - we need to set elaboration params anyway
+- correct the case
+
* Mon Jan 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.54-1
- 905055 - prevent executing both LoginAction and LoginSetupAction when re-
logging after successful logout
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 69e0190..d410be9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.54-1 java/
+1.9.55-1 java/
10 years, 4 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java | 10 +++++-----
12 files changed, 18 insertions(+), 15 deletions(-)
New commits:
commit 005d82b767039beae209071c7fc7362274a856ff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 16:30:25 2013 +0100
906345 - undo delete 'Server Delete' string
lost by 423cfc6255b7e6d52da35f7e543ec38cd99e04c9
+ reusing an unused message id
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
index 917ae8e..015149c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml
@@ -9511,7 +9511,7 @@ Folgen Sie dieser URL für die vollständige Liste inaktiver Systeme:
<source>Schedule Package Verifications</source>
<target>Paketüberprüfungen planen</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Server löschen</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index fe4b79c..9e4dc46 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7523,6 +7523,9 @@ Follow this url to see the full list of inactive systems:
<trans-unit id="ssm.package.verify.operationname">
<source>Schedule Package Verifications</source>
</trans-unit>
+ <trans-unit id="ssm.server.delete.operationname">
+ <source>Server Delete</source>
+ </trans-unit>
<trans-unit id="ssm.migrate.systems.confirmmessage">
<source>Systems Migrated</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
index cb47516..5195e32 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml
@@ -9511,7 +9511,7 @@ Vaya a esta dirección para ver la lista completa de sistemas inactivos:
<source>Schedule Package Verifications</source>
<target>Programar verificaciones de paquetes</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Borrar servidor</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
index 0c121e6..7a9b8f7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml
@@ -9512,7 +9512,7 @@ Suivez cet url pour obtenir la liste complète des systèmes inactifs :
<source>Schedule Package Verifications</source>
<target>Planifier les vérifications de packages</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Supprimer le serveur</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
index 20a2148..179b32f 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml
@@ -9510,7 +9510,7 @@ Seguite l'url sotto riportato per visualizzare l'elenco completo di sistemi inat
<source>Schedule Package Verifications</source>
<target>Programma le verifiche dei pacchetti</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Cancella server</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
index 7ebb221..e6c8079 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml
@@ -9509,7 +9509,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>パッケージ検証のスケジュール</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>サーバーの削除</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
index ab23eb7..896797e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml
@@ -9511,7 +9511,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>패키지 검증 스케줄 </target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>서버 삭제 </target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
index 355ba27..e308cbd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml
@@ -9497,7 +9497,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>Programa das Verificações do Pacote</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Deleta o Servidor</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
index ffdb591..af93d88 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml
@@ -9507,7 +9507,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>Назначить проверку пакетов</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>Удаление на сервере</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
index 2000cae..c93fac0 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml
@@ -9511,7 +9511,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>调度软件包的验证</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>删除服务器</target>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
index 24097a7..9c7c785 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml
@@ -9510,7 +9510,7 @@ Follow this url to see the full list of inactive systems:
<source>Schedule Package Verifications</source>
<target>排程套件驗證</target>
</trans-unit>
- <trans-unit id="ssm.package.delete.operationname">
+ <trans-unit id="ssm.server.delete.operationname">
<source>Server Delete</source>
<target>伺服器刪除</target>
</trans-unit>
commit de43bbedc64d83ed8c46ed1181dc279a99edfb05
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 16:01:55 2013 +0100
906345 - localize operation descriptions
diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
index ed0ace2..6b33f87 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmOperationManager.java
@@ -18,6 +18,7 @@ import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.db.datasource.WriteMode;
+import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.OperationDetailsDto;
import com.redhat.rhn.manager.BaseManager;
@@ -147,20 +148,19 @@ public class SsmOperationManager extends BaseManager {
*
* @param user user under which to associate the operation; cannot be
* <code>null</code>
- * @param description high level description of what the operation is doing;
- * cannot be <code>null</code>
+ * @param messageId message id of operation description; cannot be <code>null</code>
* @param rhnSetLabel references a RhnSet with the server IDs to associate with the
* new operation; if this is <code>null</code> no mappings will
* be created at this time
* @return the id of the created operation
*/
- public static long createOperation(User user, String description,
+ public static long createOperation(User user, String messageId,
String rhnSetLabel) {
if (user == null) {
throw new IllegalArgumentException("user cannot be null");
}
- if (description == null) {
+ if (messageId == null) {
throw new IllegalArgumentException("description cannot be null");
}
@@ -181,7 +181,7 @@ public class SsmOperationManager extends BaseManager {
params.clear();
params.put("op_id", operationId);
params.put("user_id", user.getId());
- params.put("description", description);
+ params.put("description", LocalizationService.getInstance().getMessage(messageId));
params.put("status", SsmOperationStatus.IN_PROGRESS.getText());
writeMode.executeUpdate(params);
10 years, 4 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a61bfd8d340ed57f7020d638eaa03bb310c79c5b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 31 14:52:56 2013 +0100
896015 - we need to set elaboration params anyway
not only if we plan to elaborate
addressing:
java.lang.NullPointerException
at java.util.HashMap.<init>(HashMap.java:318)
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:371)
at com.redhat.rhn.common.db.datasource.CachedStatement.executeElaborator(CachedStatement.java:360)
at com.redhat.rhn.common.db.datasource.SelectMode.elaborate(SelectMode.java:164)
at com.redhat.rhn.common.db.datasource.ModeElaborator.elaborate(ModeElaborator.java:48)
at com.redhat.rhn.frontend.taglibs.list.decorators.ElaborationDecorator.elaborateContents(ElaborationDecorator.java:57)
at com.redhat.rhn.frontend.taglibs.list.decorators.ElaborationDecorator.setCurrentList(ElaborationDecorator.java:37)
at com.redhat.rhn.frontend.taglibs.list.ListTag.doAfterBody(ListTag.java:465)
...
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 75e3afe..99d59bf 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2698,8 +2698,8 @@ public class SystemManager extends BaseManager {
params.put("user_id", user.getId());
params.put("set_label", setLabel);
retval = mode.execute(params);
+ retval.setElaborationParams(Collections.EMPTY_MAP);
if (elaborate) {
- retval.setElaborationParams(Collections.EMPTY_MAP);
retval.elaborate();
}
return retval;
10 years, 4 months
2 commits - backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/repo_plugins/yum_src.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 0a21dcbf1442a34f8ebe314eaf7d7e7d6115eeb5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 31 11:31:13 2013 +0100
Make clear_ssl_cache actually do the cleaning.
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index c5ca955..bf87f49 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -268,7 +268,6 @@ class ContentSource(object):
f.close
def clear_ssl_cache(self):
- return
repo = self.repo
dir = os.path.join(repo.basecachedir, self.name, '.ssl-certs')
try:
commit ed6855628acf32b025f25c5e4950245cf52e1e8d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 31 11:30:55 2013 +0100
Use the existing _clean_cache helper method.
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index 2bdab55..c5ca955 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -14,7 +14,6 @@
# in this software or its documentation.
#
-import shutil
import sys
import gzip
import os.path
@@ -233,7 +232,7 @@ class ContentSource(object):
return pkg.verifyLocalPkg()
def _clean_cache(self, directory):
- shutil.rmtree(directory, True)
+ rmtree(directory, True)
def get_updates(self):
if not self.repo.repoXML.repoData.has_key('updateinfo'):
@@ -273,6 +272,6 @@ class ContentSource(object):
repo = self.repo
dir = os.path.join(repo.basecachedir, self.name, '.ssl-certs')
try:
- rmtree(dir)
+ self._clean_cache(dir)
except:
pass
10 years, 4 months
Changes to 'refs/tags/spacewalk-config-1.9.3-1'
by Michael Mraka
Tag 'spacewalk-config-1.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-31 10:06 +0000
Tagging package [spacewalk-config] version [1.9.3-1] in directory [spacewalk/config/].
Changes since spacewalk-branding-1.9.5-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-config] release [1.9.3-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 4 months
rel-eng/packages spacewalk/config
by Michael Mraka
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 915f4a7ec12877e9df240d615ceb9db2efdcc09a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 31 11:06:56 2013 +0100
Automatic commit of package [spacewalk-config] release [1.9.3-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 53e1a03..a8862ea 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.9.2-1 spacewalk/config/
+1.9.3-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index f019054..fdf4ddb 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.9.2
+Version: 1.9.3
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,10 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Thu Jan 31 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.3-1
+- RewriteLock is no longer valid in apache 2.4
+- removed no longer necessary directory definitions
+
* Tue Jan 22 2013 Jan Pazdziora 1.9.2-1
- We no longer ship /var/www/html/applications.
10 years, 4 months
Changes to 'refs/tags/spacewalk-branding-1.9.5-1'
by Michael Mraka
Tag 'spacewalk-branding-1.9.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-31 10:05 +0000
Tagging package [spacewalk-branding] version [1.9.5-1] in directory [branding/].
Changes since spacewalk-web-1.9.10-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-branding] release [1.9.5-1].
---
branding/spacewalk-branding.spec | 6 +++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 4 months
branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/spacewalk-branding.spec | 6 +++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 77f0e5ea2f8c3bb568b248af28effde62c5fcdae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jan 31 11:05:56 2013 +0100
Automatic commit of package [spacewalk-branding] release [1.9.5-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index a24c402..d49743f 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -88,6 +88,10 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Jan 31 2013 Michael Mraka <michael.mraka(a)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.
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 01e7685..2d73ca4 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.9.4-1 branding/
+1.9.5-1 branding/
10 years, 4 months