Changes to 'refs/tags/spacewalk-setup-postgresql-1.10.3-1'
by Milan Zazrivec
Tag 'spacewalk-setup-postgresql-1.10.3-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-07 09:12 +0000
Tagging package [spacewalk-setup-postgresql] version [1.10.3-1] in directory [spacewalk/spacewalk-setup-postgresql/].
Changes since spacewalk-backend-1.10.44-1:
Milan Zazrivec (2):
Fix requires for RHEL-5
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.3-1].
---
rel-eng/packages/spacewalk-setup-postgresql | 2 -
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 11 ++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-postgresql | 2 +-
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 40e9d3f6f825c005ee52697f145dbdecb32b135e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 11:12:06 2013 +0200
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.3-1].
diff --git a/rel-eng/packages/spacewalk-setup-postgresql b/rel-eng/packages/spacewalk-setup-postgresql
index 0aca7c8..1624c59 100644
--- a/rel-eng/packages/spacewalk-setup-postgresql
+++ b/rel-eng/packages/spacewalk-setup-postgresql
@@ -1 +1 @@
-1.10.2-1 spacewalk/spacewalk-setup-postgresql/
+1.10.3-1 spacewalk/spacewalk-setup-postgresql/
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
index dab4203..6d29475 100644
--- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
+++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-postgresql
-Version: 1.10.2
+Version: 1.10.3
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -48,6 +48,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
+* Fri Jun 07 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.3-1
+- Fix requires for RHEL-5
+
* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.2-1
- initial build
10 years, 10 months
spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit f0bd7359b97d465716a4b24cdb48fa14bae1e582
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 7 11:11:38 2013 +0200
Fix requires for RHEL-5
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
index b34074f..dab4203 100644
--- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
+++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -9,7 +9,11 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{versio
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: postgresql-server > 8.4
-Requires: postgresql-contrib > 8.4
+%if 0%{?rhel} == 5
+Requires: postgresql84-contrib
+%else
+Requires: postgresql-contrib >= 8.4
+%endif
Obsoletes: spacewalk-setup-embedded-postgresql
%description
10 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.10.44-1'
by Michael Mraka
Tag 'spacewalk-backend-1.10.44-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-06-06 09:53 +0000
Tagging package [spacewalk-backend] version [1.10.44-1] in directory [backend/].
Changes since spacewalk-setup-postgresql-1.10.2-1:
Michael Mraka (2):
675228, 795000 - metadata are already in utf8
Automatic commit of package [spacewalk-backend] release [1.10.44-1].
Milan Zazrivec (1):
remove spacewalk-setup-embedded-postgresql from packages
---
backend/satellite_tools/exporter/xmlWriter.py | 25 ++-----------------
backend/spacewalk-backend.spec | 5 +++
rel-eng/packages/spacewalk-backend | 2 -
rel-eng/packages/spacewalk-setup-embedded-postgresql | 1
4 files changed, 8 insertions(+), 25 deletions(-)
---
10 years, 10 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/exporter/xmlWriter.py | 25 +++----------------------
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 8 insertions(+), 24 deletions(-)
New commits:
commit 548d6b6fc1b6c16cb8d01c6faa595ca317ff6213
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jun 6 11:53:39 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.10.44-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0db48dc..61d7c06 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.10.43
+Version: 1.10.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jun 06 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.44-1
+- 675228, 795000 - metadata are already in utf8
+
* Tue Jun 04 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.43-1
- 970315 - support both gz and bz2 compressed repo files
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index bff1f9d..60a4365 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.43-1 backend/
+1.10.44-1 backend/
commit f72086a7b3ca648ab72fb497b5cf36e59d0dcb38
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jun 5 15:19:03 2013 +0200
675228, 795000 - metadata are already in utf8
stop running utf8 data through iso8859-1 -> utf8 conversion
as well as truncating them
diff --git a/backend/satellite_tools/exporter/xmlWriter.py b/backend/satellite_tools/exporter/xmlWriter.py
index 8cee1c9..3d7525d 100644
--- a/backend/satellite_tools/exporter/xmlWriter.py
+++ b/backend/satellite_tools/exporter/xmlWriter.py
@@ -36,21 +36,11 @@ class XMLWriter:
'"': '"',
"'": ''',
}
- def __init__(self, charset="iso-8859-1", encoding = "UTF-8",
- stream=sys.stdout, skip_xml_decl=0):
+ def __init__(self, stream=sys.stdout, skip_xml_decl=0):
self.tag_stack = []
- if charset[:9] != "iso-8859-":
- raise Exception, "Unsupported charset"
-
- self.charset = charset
- self.encoding = encoding
self.stream = stream
if not skip_xml_decl:
- self.stream.write('<?xml version="1.0" encoding="%s"?>' % self.encoding)
-
- def _convert(self, s):
- # Converts the string to the desired encoding
- return unicode(s, self.charset).encode(self.encoding)
+ self.stream.write('<?xml version="1.0" encoding="UTF-8"?>')
def open_tag(self, name, attributes=None, namespace=None):
"Opens a tag with the specified attributes"
@@ -114,16 +104,7 @@ class XMLWriter:
else:
data_string = str(data_string)
- converted = self._convert(data_string)
- if max_bytes is not None and len(converted) > max_bytes:
- # we're too large. operate on the unconverted string
- # so that we remove whole characters, even though it may be
- # too many.
- log_error("Truncating field to fit in satellite schema. "
- "First 30 bytes are:", converted[:30])
- extra = max_bytes - len(converted)
- converted = self._convert(data_string[:extra])
- data_string = self._re.sub(self._sub_function, converted)
+ data_string = self._re.sub(self._sub_function, data_string)
self.stream.write(data_string)
# Helper functions
10 years, 10 months
rel-eng/packages
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-embedded-postgresql | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 068a768564ba6935fb826a8b7ee67bbf94d0385f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 5 17:58:59 2013 +0200
remove spacewalk-setup-embedded-postgresql from packages
diff --git a/rel-eng/packages/spacewalk-setup-embedded-postgresql b/rel-eng/packages/spacewalk-setup-embedded-postgresql
deleted file mode 100644
index bd58f8e..0000000
--- a/rel-eng/packages/spacewalk-setup-embedded-postgresql
+++ /dev/null
@@ -1 +0,0 @@
-1.10.1-1 spacewalk/spacewalk-setup-embedded-postgresql/
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-postgresql-1.10.2-1'
by Milan Zazrivec
Tag 'spacewalk-setup-postgresql-1.10.2-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-05 15:43 +0000
Tagging package [spacewalk-setup-postgresql] version [1.10.2-1] in directory [spacewalk/spacewalk-setup-postgresql/].
Changes since spacewalk-setup-1.10.10-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.2-1].
---
rel-eng/packages/spacewalk-setup-postgresql | 1 +
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
---
10 years, 10 months
rel-eng/packages spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
rel-eng/packages/spacewalk-setup-postgresql | 1 +
spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 76cf3fff7a1dab0021308cd87c0c240589094e18
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 5 17:43:04 2013 +0200
Automatic commit of package [spacewalk-setup-postgresql] release [1.10.2-1].
diff --git a/rel-eng/packages/spacewalk-setup-postgresql b/rel-eng/packages/spacewalk-setup-postgresql
new file mode 100644
index 0000000..0aca7c8
--- /dev/null
+++ b/rel-eng/packages/spacewalk-setup-postgresql
@@ -0,0 +1 @@
+1.10.2-1 spacewalk/spacewalk-setup-postgresql/
diff --git a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
index 25dfaea..b34074f 100644
--- a/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
+++ b/spacewalk/spacewalk-setup-postgresql/spacewalk-setup-postgresql.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup-postgresql
-Version: 1.10.1
+Version: 1.10.2
Release: 1%{?dist}
Summary: Tools to setup embedded PostgreSQL database for Spacewalk
Group: Applications/System
@@ -44,6 +44,9 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/*
%changelog
+* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.2-1
+- initial build
+
* Mon May 06 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.1-1
- make spacewalk-setup-embedded-postgresql systemctl-aware
- manage embedded PostgreSQL by spacewalk-service
10 years, 10 months
Changes to 'refs/tags/spacewalk-setup-1.10.10-1'
by Milan Zazrivec
Tag 'spacewalk-setup-1.10.10-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-06-05 15:42 +0000
Tagging package [spacewalk-setup] version [1.10.10-1] in directory [spacewalk/setup/].
Changes since spacewalk-web-1.10.25-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-setup] release [1.10.10-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit e0486082c8a9a25f9ef5e882c748e93081f663a0
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Jun 5 17:42:35 2013 +0200
Automatic commit of package [spacewalk-setup] release [1.10.10-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 6fb5748..918ab7a 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.10.9-1 spacewalk/setup/
+1.10.10-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 191b7fb..3f914b0 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 1.10.9
+Version: 1.10.10
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,10 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.10-1
+- spacewalk-setup: correctly recognize --managed-db switch
+- modify spacewalk-setup to use spacewalk-setup-postgresql
+
* Thu May 09 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.9-1
- 958677 - suppress uninitialized value messages
10 years, 10 months