Changes to 'refs/tags/spacewalk-web-1.7.28-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.7.28-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-02 14:23 +0000
Tagging package [spacewalk-web] version [1.7.28-1] in directory [web/].
Changes since spacewalk-java-1.7.51-1:
Jan Pazdziora (2):
Going for release.
Automatic commit of package [spacewalk-web] release [1.7.28-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/conf/rhn_web.conf | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 3 months
Changes to 'refs/tags/spacewalk-repo-1.7-5'
by Jan Pazdziora
Tag 'spacewalk-repo-1.7-5' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-02 15:20 +0000
Tagging package [spacewalk-repo] version [1.7-5] in directory [spec-tree/spacewalk-repo/].
Changes since spacewalk-backend-1.7.38-1:
Jan Pazdziora (3):
Add separate -nightly.repo definitions for nightly Spacewalk repos.
Start signing with new gpg key.
Automatic commit of package [spacewalk-repo] minor release [1.7-5].
---
rel-eng/packages/spacewalk-repo | 2 -
spec-tree/spacewalk-repo/spacewalk-repo.spec | 43 ++++++++++++++++++++-------
2 files changed, 34 insertions(+), 11 deletions(-)
---
12 years, 3 months
rel-eng/packages spec-tree/spacewalk-repo
by Jan Pazdziora
rel-eng/packages/spacewalk-repo | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 81e05f26710f90c2a463ddec0eb6c060d8ac5d27
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 2 16:20:12 2012 +0100
Automatic commit of package [spacewalk-repo] minor release [1.7-5].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index 49078c9..406be0c 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-1.7-4 spec-tree/spacewalk-repo/
+1.7-5 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index aeb2fc9..80c2234 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 1.7
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
@@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
%config %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Fri Mar 02 2012 Jan Pazdziora 1.7-5
+- Start signing with new gpg key.
+- Add separate -nightly.repo definitions for nightly Spacewalk repos.
+
* Wed Feb 01 2012 Jan Pazdziora 1.7-4
- Revert "add Source0"
12 years, 3 months
spec-tree/spacewalk-repo
by Jan Pazdziora
spec-tree/spacewalk-repo/spacewalk-repo.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 84ae0491cc9cb955c2d4becf1e002e64e68ac070
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 2 16:19:44 2012 +0100
Start signing with new gpg key.
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 65dd5c6..aeb2fc9 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -41,7 +41,7 @@ cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO
[spacewalk]
name=Spacewalk
baseurl=http://spacewalk.redhat.com/yum/%{version}/%{reposubdir}/\$basearch/
-gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
enabled=1
gpgcheck=1
REPO
@@ -50,7 +50,7 @@ cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-client.repo <<REPO
[spacewalk-client]
name=Spacewalk Client Tools
baseurl=http://spacewalk.redhat.com/yum/%{version}-client/%{reposubdir}/\...
-gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
enabled=1
gpgcheck=1
REPO
@@ -59,7 +59,7 @@ cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-source.repo <<REPO
[spacewalk-source]
name=Spacewalk SRPMS
baseurl=http://spacewalk.redhat.com/source/%{version}/%{reposubdir}/
-gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
enabled=0
gpgcheck=1
REPO
@@ -68,7 +68,7 @@ cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-nightly.repo <<REPO
[spacewalk-nightly]
name=Spacewalk nightly
baseurl=http://spacewalk.redhat.com/yum/nightly/%{reposubdir}/\$basearch/
-gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
enabled=0
gpgcheck=0
REPO
@@ -77,7 +77,7 @@ cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo <<
[spacewalk-client-nightly]
name=Spacewalk Client Tools nightly
baseurl=http://spacewalk.redhat.com/yum/nightly-client/%{reposubdir}/\$ba...
-gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
enabled=0
gpgcheck=0
REPO
12 years, 3 months
spec-tree/spacewalk-repo
by Jan Pazdziora
spec-tree/spacewalk-repo/spacewalk-repo.spec | 31 +++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
New commits:
commit 798a3febe35153f793c0829c8cf34b14c0a9f7f3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 2 15:39:31 2012 +0100
Add separate -nightly.repo definitions for nightly Spacewalk repos.
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 41e5adb..65dd5c6 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -40,21 +40,19 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk.repo <<REPO
[spacewalk]
name=Spacewalk
-#baseurl=http://spacewalk.redhat.com/yum/%{version}/%{reposubdir}/\$basearch/
-baseurl=http://spacewalk.redhat.com/yum/nightly/%{reposubdir}/\$basearch/
+baseurl=http://spacewalk.redhat.com/yum/%{version}/%{reposubdir}/\$basearch/
gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
enabled=1
-gpgcheck=0
+gpgcheck=1
REPO
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-client.repo <<REPO
[spacewalk-client]
name=Spacewalk Client Tools
-#baseurl=http://spacewalk.redhat.com/yum/%{version}-client/%{reposubdir}/\$basearch/
-baseurl=http://spacewalk.redhat.com/yum/nightly-client/%{reposubdir}/\$basearch/
+baseurl=http://spacewalk.redhat.com/yum/%{version}-client/%{reposubdir}/\$basearch/
gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
enabled=1
-gpgcheck=0
+gpgcheck=1
REPO
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-source.repo <<REPO
@@ -66,6 +64,24 @@ enabled=0
gpgcheck=1
REPO
+cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-nightly.repo <<REPO
+[spacewalk-nightly]
+name=Spacewalk nightly
+baseurl=http://spacewalk.redhat.com/yum/nightly/%{reposubdir}/\$basearch/
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+enabled=0
+gpgcheck=0
+REPO
+
+cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo <<REPO
+[spacewalk-client-nightly]
+name=Spacewalk Client Tools nightly
+baseurl=http://spacewalk.redhat.com/yum/nightly-client/%{reposubdir}/\$basearch/
+gpgkey=http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2010
+enabled=0
+gpgcheck=0
+REPO
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,10 +89,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%config %{_sysconfdir}/yum.repos.d/spacewalk.repo
%config %{_sysconfdir}/yum.repos.d/spacewalk-source.repo
+%config %{_sysconfdir}/yum.repos.d/spacewalk-nightly.repo
+%config %{_sysconfdir}/yum.repos.d/spacewalk-source.repo
%files -n spacewalk-client-repo
%defattr(-,root,root,-)
%config %{_sysconfdir}/yum.repos.d/spacewalk-client.repo
+%config %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
* Wed Feb 01 2012 Jan Pazdziora 1.7-4
12 years, 3 months
Changes to 'refs/tags/spacewalk-backend-1.7.38-1'
by Michael Mraka
Tag 'spacewalk-backend-1.7.38-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-03-02 14:45 +0000
Tagging package [spacewalk-backend] version [1.7.38-1] in directory [backend/].
Changes since spacewalk-java-1.7.51-1:
Michael Mraka (2):
channel id have to be number
Automatic commit of package [spacewalk-backend] release [1.7.38-1].
---
backend/satellite_tools/reposync.py | 11 ++++++-----
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---
12 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2a0e9025964c30b9acf76610cba59fdcb004bcf1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 2 15:45:23 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.7.38-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index aa92870..93d4905 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.7.37
+Version: 1.7.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Mar 02 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.7.38-1
+- channel id have to be number
+
* Fri Mar 02 2012 Jan Pazdziora 1.7.37-1
- Update the copyright year info.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a9b48e2..9acbc01 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.7.37-1 backend/
+1.7.38-1 backend/
12 years, 3 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/reposync.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit a67d6c3e423a624a9df0f35009d823abf5a3d78e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 2 15:42:03 2012 +0100
channel id have to be number
otherwise package is downloaded over and over
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 6504093..70cbd3d 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -80,7 +80,7 @@ class RepoSync(object):
rhnChannelContentSource cs
where s.id = cs.source_id
and cs.channel_id = :channel_id""")
- h.execute(channel_id=self.channel['id'])
+ h.execute(channel_id=int(self.channel['id']))
source_data = h.fetchall_dict()
if source_data:
self.urls = [(row['id'], row['source_url']) for row in source_data]
@@ -176,7 +176,7 @@ class RepoSync(object):
'version' : pkg['version'],
'release' : pkg['release'],
'arch' : pkg['arch'],
- 'channel_id' : self.channel['id'],
+ 'channel_id' : int(self.channel['id']),
}
if pkg['epoch'] is None or pkg['epoch'] == '':
epochStatement = "is NULL"
@@ -307,10 +307,11 @@ class RepoSync(object):
self.print_msg("Packages in repo: %5d" % plug.num_packages)
if plug.num_excluded:
self.print_msg("Packages passed filter rules: %5d" % num_passed)
+ channel_id = int(self.channel['id'])
for pack in packages:
db_pack = rhnPackage.get_info_for_package(
[pack.name, pack.version, pack.release, pack.epoch, pack.arch],
- self.channel['id'])
+ channel_id)
to_download = True
to_link = True
@@ -320,10 +321,10 @@ class RepoSync(object):
pack.checksum_type, pack.checksum):
# package is already on disk
to_download = False
- if db_pack['channel_id'] == self.channel['id']:
+ if db_pack['channel_id'] == channel_id:
# package is already in the channel
to_link = False
- elif db_pack['channel_id'] == self.channel['id']:
+ elif db_pack['channel_id'] == channel_id:
# different package with SAME NVREA
self.disassociate_package(db_pack)
12 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.7.51-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.7.51-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-02 13:11 +0000
Tagging package [spacewalk-java] version [1.7.51-1] in directory [java/].
Changes since spacewalk-web-1.7.27-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.7.51-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 3 months