Changes to 'refs/tags/spacewalk-schema-1.6.16-1'
by Michael Mraka
Tag 'spacewalk-schema-1.6.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-09-15 08:51 +0000
Tagging package [spacewalk-schema] version [1.6.16-1] in directory [schema/spacewalk/].
Changes since perl-NOCpulse-Probe-1.184.12-1:
Michael Mraka (3):
implemented Database.execute()
529064 - fixed update_needed_cache which wrongly updated cache if a package was in more erratas
Automatic commit of package [spacewalk-schema] release [1.6.16-1].
---
backend/server/rhnSQL/driver_postgresql.py | 5
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/postgres/packages/rhn_server.pkb | 67 +---------
schema/spacewalk/spacewalk-schema.spec | 6
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.postgresql | 20 ++
6 files changed, 39 insertions(+), 62 deletions(-)
---
12 years, 8 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 5617acf460e38fa37ca6cd8e2195dc77e9e04fa2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 15 10:51:10 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.16-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 31d4360..3b5207c 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.15-1 schema/spacewalk/
+1.6.16-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5784f42..d7b3830 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.6.15
+Version: 1.6.16
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Sep 15 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.16-1
+- 529064 - fixed update_needed_cache which wrongly updated cache if a package
+ was in more erratas
+
* Fri Sep 09 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.15-1
- added EPEL to the list of package providers
- added rpm signing keys for F15, CentOS 6, Scientfic Linux 6 and EPEL
12 years, 8 months
2 commits - backend/server schema/spacewalk
by Michael Mraka
backend/server/rhnSQL/driver_postgresql.py | 5
schema/spacewalk/postgres/packages/rhn_server.pkb | 67 +---------
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.postgresql | 20 ++
4 files changed, 33 insertions(+), 60 deletions(-)
New commits:
commit d51fb288da2226782ed18452dc766cb3256a19a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 15 10:43:37 2011 +0200
529064 - fixed update_needed_cache which wrongly updated cache if a package was in more erratas
we tested several different aproaches and the ugliest one - delete and
reinsert all - was surprisingly the fastest one
also fixing
INFO | jvm 1 | 2011/09/15 05:40:00 | Caused by: org.postgresql.util.PSQLException: ERROR: relation "old_packages" already exists
which is most likely triggered when update_needed_cache() is called more
than once in parallel
this reimplements commit 74665cc2f5ce9d14592ba5ba15afea16050da420 for postgresql
diff --git a/schema/spacewalk/postgres/packages/rhn_server.pkb b/schema/spacewalk/postgres/packages/rhn_server.pkb
index 9ef85f0..3533094 100644
--- a/schema/spacewalk/postgres/packages/rhn_server.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_server.pkb
@@ -786,67 +786,14 @@ update pg_settings set setting = 'rhn_server,' || setting where name = 'search_p
create or replace function update_needed_cache(
server_id_in in numeric
) returns void as $$
- declare
- i record;
- old record;
- new record;
begin
-
- create temp table old_packages (
- errata_id numeric,
- package_id numeric
- ) on commit drop;
-
- create temp table new_packages (
- errata_id numeric,
- package_id numeric
- ) on commit drop;
-
- -- old packages to be deleted
- for i in (
- select errata_id, package_id
- from rhnServerNeededCache
- where server_id = server_id_in
- ) loop
- insert into old_packages values (i.errata_id, i.package_id);
- end loop;
-
- -- new packages to be added
- for i in (
- select errata_id, package_id
- from rhnServerNeededView
- where server_id = server_id_in
- ) loop
- if exists (select 1 from old_packages where
- package_id = i.package_id
- and errata_id = i.errata_id
- or errata_id is null and i.errata_id is null)
- then
- -- package is both old and new, so simply do nothing
- delete from old_packages where package_id = i.package_id;
- else
- insert into new_packages values (i.errata_id, i.package_id);
- end if;
- end loop;
-
- -- delete old packages
- for old in (
- select * from old_packages
- ) loop
- delete from rhnServerNeededCache
- where server_id = server_id_in
- and package_id = old.package_id
- and (errata_id = old.errata_id
- or errata_id is null and old.errata_id is null);
- end loop;
-
- -- insert new packages
- for new in (
- select * from new_packages
- ) loop
- insert into rhnServerNeededCache (server_id, errata_id, package_id)
- values (server_id_in, new.errata_id, new.package_id);
- end loop;
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct server_id, errata_id, package_id
+ from rhnServerNeededView
+ where server_id = server_id_in);
end$$ language plpgsql;
-- restore the original setting
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.postgresql
new file mode 100644
index 0000000..cedb4b9
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/085-rhn_server.pkb.sql.postgresql
@@ -0,0 +1,20 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+--update pg_setting
+update pg_settings set setting = 'rhn_server,' || setting where name = 'search_path';
+
+ create or replace function update_needed_cache(
+ server_id_in in numeric
+ ) returns void as $$
+ begin
+ delete from rhnServerNeededCache
+ where server_id = server_id_in;
+ insert into rhnServerNeededCache
+ (server_id, errata_id, package_id)
+ (select distinct server_id, errata_id, package_id
+ from rhnServerNeededView
+ where server_id = server_id_in);
+ end$$ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_server')+1) ) where name = 'search_path';
commit a76d12fabaca535d1ec48f1e8e78ff7ccaaf04f6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 13 14:42:06 2011 +0200
implemented Database.execute()
fixing
Traceback (most recent call last):
File "./entitlement-check.py", line 315, in <module>
main()
File "./entitlement-check.py", line 90, in main
results = check_channel_family(family, quantity, flex) and results
File "./entitlement-check.py", line 99, in check_channel_family
return global_test(label, quantity, flex) and org_test(label, quantity, flex)
File "./entitlement-check.py", line 217, in global_test
guests = rhnSQL.execute(guest_count_sql, label=label).fetchall_dict()
File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/__init__.py", line 199, in execute
return apply(db.execute, (sql, ) + args, kwargs)
AttributeError: Database instance has no attribute 'execute'
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index b1fa2c4..19e0e99 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -202,6 +202,11 @@ class Database(sql_base.Database):
sql = "select rhn_asdf_%s(%s)" % (sha1, qparams)
return Cursor(dbh=self.dbh, sql=sql, force=force)
+ def execute(self, sql, *args, **kwargs):
+ cursor = self.prepare(sql)
+ cursor.execute(*args, **kwargs)
+ return cursor
+
def transaction(self, name):
if not name:
raise rhnException("Can not set a transaction without a name", name)
12 years, 8 months
Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.12-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-Probe-1.184.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-09-14 14:00 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.12-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since spacewalk-proxy-installer-1.6.4-1:
Jan Pazdziora (4):
We use tito tag instead of make tag-release for quite some time.
Revert "remove duplicated SQLPlus.pm file from main package as it is already in -Oracle" and "Addressing warning: File listed twice caused by the previous commit."
The NOCpulse::Probe::Shell::SQLPlus needs to be in perl-NOCpulse-Probe, not in -Oracle.
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.12-1].
Marcelo Moreira de Mello (1):
Packaging of rhncfg on Debian
Simon Lukasik (5):
Amend copy-pasted information in changelog
The package should not declare a relationship with itself
Makefile.rhncfg does not process PLATFORM variable, removing.
/usr/bin/docbook2man is needed to for manpage build
Install man pages to FHS-2.3 compliant location
---
client/debian/rhncfg/debian/changelog | 5 +
client/debian/rhncfg/debian/compat | 1
client/debian/rhncfg/debian/control | 15 +++++
client/debian/rhncfg/debian/copyright | 43 +++++++++++++++
client/debian/rhncfg/debian/pycompat | 1
client/debian/rhncfg/debian/rules | 16 +++++
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 21 +++----
rel-eng/packages/.README | 6 +-
rel-eng/packages/perl-NOCpulse-Probe | 2
9 files changed, 95 insertions(+), 15 deletions(-)
---
12 years, 8 months
monitoring/PerlModules rel-eng/packages
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 9 ++++++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 371dc4ce64d93c30a0af20ef906a277390a76c8c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 14 16:00:39 2011 +0200
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.12-1].
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index 5492a96..aba6a59 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe
Summary: Monitoring probes for Spacewalk
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.184.11
+Version: 1.184.12
Release: 1%{?dist}
BuildArch: noarch
Group: Development/Libraries
@@ -145,6 +145,13 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/NOCpulse/Probe/DataSource/test/TestOracle.pm
%changelog
+* Wed Sep 14 2011 Jan Pazdziora 1.184.12-1
+- The NOCpulse::Probe::Shell::SQLPlus needs to be in perl-NOCpulse-Probe, not
+ in -Oracle.
+- Revert "remove duplicated SQLPlus.pm file from main package as it is already
+ in -Oracle" and "Addressing warning: File listed twice caused by the previous
+ commit."
+
* Tue Sep 13 2011 Jan Pazdziora 1.184.11-1
- Addressing warning: File listed twice caused by the previous commit.
- remove duplicated SQLPlus.pm file from main package as it is already in
diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe
index 782b48a..5504139 100644
--- a/rel-eng/packages/perl-NOCpulse-Probe
+++ b/rel-eng/packages/perl-NOCpulse-Probe
@@ -1 +1 @@
-1.184.11-1 monitoring/PerlModules/NP/Probe/
+1.184.12-1 monitoring/PerlModules/NP/Probe/
12 years, 8 months
2 commits - monitoring/PerlModules
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 8e220ac41e6cdbe7606baa21b8cb32935e2f3efb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 14 15:46:56 2011 +0200
The NOCpulse::Probe::Shell::SQLPlus needs to be in perl-NOCpulse-Probe, not in -Oracle.
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index 259d3f7..5492a96 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -135,15 +135,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/NOCpulse::Probe::Shell::SSH*
%{_mandir}/man3/NOCpulse::Probe::Shell::Unix*
%{_mandir}/man3/monitoring-data-cleanup*
+%{_mandir}/man3/NOCpulse::Probe::Shell::SQLPlus*
%doc LICENSE
%files Oracle
%defattr(-,root,root,-)
-%{perl_vendorlib}/NOCpulse/Probe/Shell/SQLPlus.pm
%{perl_vendorlib}/NOCpulse/Probe/DataSource/CannedOracle.pm
%{perl_vendorlib}/NOCpulse/Probe/DataSource/Oracle.pm
%{perl_vendorlib}/NOCpulse/Probe/DataSource/test/TestOracle.pm
-%{_mandir}/man3/NOCpulse::Probe::Shell::SQLPlus*
%changelog
* Tue Sep 13 2011 Jan Pazdziora 1.184.11-1
commit 9859dbc48e3e25cccd5bffbc3a33a53fa0bd9834
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 14 15:59:17 2011 +0200
Revert "remove duplicated SQLPlus.pm file from main package as it is already in -Oracle" and "Addressing warning: File listed twice caused by the previous commit."
Moving SQLPlus to the -Oracle subpackage would make perl-NOCpulse-Probe
always require perl-NOCpulse-Probe-Oracle.
This reverts commits cce816cab750170ad7a58921134c79b0ee9e0a92
and d3a322bf0065377756022a932fbfcb6cb79d1a7f.
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index e1fe40e..259d3f7 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -82,7 +82,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{perl_vendorlib}/NOCpulse
%dir %{perl_vendorlib}/NOCpulse/Probe
%dir %{perl_vendorlib}/NOCpulse/Probe/DataSource
-%dir %{perl_vendorlib}/NOCpulse/Probe/Shell
%{perl_vendorlib}/NOCpulse/Probe/Config*
%{perl_vendorlib}/NOCpulse/Probe/DataSource/AbstractDataSource.pm
%{perl_vendorlib}/NOCpulse/Probe/DataSource/AbstractDatabase.pm
@@ -125,13 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/NOCpulse/Probe/DataSource/test/TestWindowsCommand.pm
%{perl_vendorlib}/NOCpulse/Probe/*.pm
%{perl_vendorlib}/NOCpulse/Probe/SNMP*
-%{perl_vendorlib}/NOCpulse/Probe/Shell/AbstractShell.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/CannedWindowsService.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/Local.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/SSH.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/Unix.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/WindowsService.pm
-%{perl_vendorlib}/NOCpulse/Probe/Shell/test
+%{perl_vendorlib}/NOCpulse/Probe/Shell*
%{perl_vendorlib}/NOCpulse/Probe/Utils*
%{perl_vendorlib}/NOCpulse/Probe/test*
%{_mandir}/man3/NOCpulse::Probe::DataSource*
12 years, 8 months
6 commits - client/debian
by Šimon Lukašík
client/debian/rhncfg/debian/changelog | 5 +++
client/debian/rhncfg/debian/compat | 1
client/debian/rhncfg/debian/control | 15 +++++++++++
client/debian/rhncfg/debian/copyright | 43 ++++++++++++++++++++++++++++++++++
client/debian/rhncfg/debian/pycompat | 1
client/debian/rhncfg/debian/rules | 16 ++++++++++++
6 files changed, 81 insertions(+)
New commits:
commit 660912a70238f085bb485557570109cc9ea7e2c2
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Sep 14 13:52:07 2011 +0200
Install man pages to FHS-2.3 compliant location
Addressing lintian error:
E: rhncfg: FSSTND-dir-in-usr usr/man/
diff --git a/client/debian/rhncfg/debian/rules b/client/debian/rhncfg/debian/rules
index 7acabbd..d77b68f 100755
--- a/client/debian/rhncfg/debian/rules
+++ b/client/debian/rhncfg/debian/rules
@@ -3,7 +3,7 @@
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-params=-f Makefile.rhncfg PREFIX=$(CURDIR)/debian/rhncfg
+params=-f Makefile.rhncfg PREFIX=$(CURDIR)/debian/rhncfg MANDIR=$(DESTDIR)/usr/share/man
override_dh_auto_clean:
$(MAKE) $(params) clean
commit 2de1b821b5d91f8ab419989dbeb2757c065c8e80
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Sep 14 13:18:29 2011 +0200
/usr/bin/docbook2man is needed to for manpage build
Addressing lintian warning:
W: rhncfg: binary-without-manpage usr/bin/rhn-actions-control
W: rhncfg: binary-without-manpage usr/bin/rhncfg-client
W: rhncfg: binary-without-manpage usr/bin/rhncfg-manager
diff --git a/client/debian/rhncfg/debian/control b/client/debian/rhncfg/debian/control
index 8dad8fe..ab92edc 100644
--- a/client/debian/rhncfg/debian/control
+++ b/client/debian/rhncfg/debian/control
@@ -2,7 +2,7 @@ Source: rhncfg
Section: python
Priority: extra
Maintainer: Marcelo Moreira de Mello <mmello(a)redhat.com>
-Build-Depends: python, debhelper (>= 7.0.50~)
+Build-Depends: python, docbook-utils, debhelper (>= 7.0.50~)
Build-Depends-Indep: python-support (>= 0.8)
Standards-Version: 3.9.1
Homepage: https://fedorahosted.org/spacewalk
commit 05f3ca4b75e89f10b5d1ca0d7500d084e2137206
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Sep 14 11:21:53 2011 +0200
Makefile.rhncfg does not process PLATFORM variable, removing.
diff --git a/client/debian/rhncfg/debian/rules b/client/debian/rhncfg/debian/rules
index ee8513b..7acabbd 100755
--- a/client/debian/rhncfg/debian/rules
+++ b/client/debian/rhncfg/debian/rules
@@ -3,7 +3,7 @@
#
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-params=-f Makefile.rhncfg PLATFORM=deb PREFIX=$(CURDIR)/debian/rhncfg
+params=-f Makefile.rhncfg PREFIX=$(CURDIR)/debian/rhncfg
override_dh_auto_clean:
$(MAKE) $(params) clean
commit 68af348c6d3d814c7e30910552fda1520b44e85e
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Sep 14 10:48:44 2011 +0200
The package should not declare a relationship with itself
Addressing lintian warning:
W: rhncfg: package-relation-with-self provides: rhncfg
diff --git a/client/debian/rhncfg/debian/control b/client/debian/rhncfg/debian/control
index 488588c..8dad8fe 100644
--- a/client/debian/rhncfg/debian/control
+++ b/client/debian/rhncfg/debian/control
@@ -10,7 +10,6 @@ Homepage: https://fedorahosted.org/spacewalk
Package: rhncfg
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-rhnlib (>= 2.5.40), rhn-client-tools
-Provides: rhncfg
Recommends: apt-spacewalk
Description: Red Hat Network Configuration Management Client is some tools
which provides a interface used to communicate against configuration channels.
commit ad493415cb0a17387d74e3179c09b269ce2753c8
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Sep 14 10:07:08 2011 +0200
Amend copy-pasted information in changelog
diff --git a/client/debian/rhncfg/debian/changelog b/client/debian/rhncfg/debian/changelog
index 58b8b6d..7a6cf07 100644
--- a/client/debian/rhncfg/debian/changelog
+++ b/client/debian/rhncfg/debian/changelog
@@ -1,6 +1,5 @@
rhncfg (5.10.14) unstable; urgency=low
- * Update to upstream version
- * The Debian client on x86_64 should send amd64-debian-linux
+ * Initial version of Debian package
-- Marcelo Moreira de Mello <mmello(a)redhat.com> Fri, 9 Sep 2011 08:12:00 -0300
commit ab58bda9f93e3e9bbaba15a96855e4632ca8340b
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Wed Sep 14 10:05:14 2011 +0200
Packaging of rhncfg on Debian
diff --git a/client/debian/rhncfg/debian/changelog b/client/debian/rhncfg/debian/changelog
new file mode 100644
index 0000000..58b8b6d
--- /dev/null
+++ b/client/debian/rhncfg/debian/changelog
@@ -0,0 +1,6 @@
+rhncfg (5.10.14) unstable; urgency=low
+
+ * Update to upstream version
+ * The Debian client on x86_64 should send amd64-debian-linux
+
+ -- Marcelo Moreira de Mello <mmello(a)redhat.com> Fri, 9 Sep 2011 08:12:00 -0300
diff --git a/client/debian/rhncfg/debian/compat b/client/debian/rhncfg/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/client/debian/rhncfg/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/client/debian/rhncfg/debian/control b/client/debian/rhncfg/debian/control
new file mode 100644
index 0000000..488588c
--- /dev/null
+++ b/client/debian/rhncfg/debian/control
@@ -0,0 +1,16 @@
+Source: rhncfg
+Section: python
+Priority: extra
+Maintainer: Marcelo Moreira de Mello <mmello(a)redhat.com>
+Build-Depends: python, debhelper (>= 7.0.50~)
+Build-Depends-Indep: python-support (>= 0.8)
+Standards-Version: 3.9.1
+Homepage: https://fedorahosted.org/spacewalk
+
+Package: rhncfg
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-rhnlib (>= 2.5.40), rhn-client-tools
+Provides: rhncfg
+Recommends: apt-spacewalk
+Description: Red Hat Network Configuration Management Client is some tools
+ which provides a interface used to communicate against configuration channels.
diff --git a/client/debian/rhncfg/debian/copyright b/client/debian/rhncfg/debian/copyright
new file mode 100644
index 0000000..8fed2b0
--- /dev/null
+++ b/client/debian/rhncfg/debian/copyright
@@ -0,0 +1,43 @@
+Format: <VERSIONED_FORMAT_URL>
+Upstream-Name: rhncfg
+Source: https://fedorahosted.org/releases/s/p/spacewalk/
+
+Files: *
+Copyright: Copyright 2011 Red Hat Inc. <spacewalk-devel(a)redhat.com>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ See /usr/share/common-licenses/GPL-2, or
+ <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+ of the GNU General Public License.
+
+Files: debian/*
+Copyright: Copyright 2011 Šimon Lukašík <xlukas08(a)stud.fit.vutbr.cz>
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ See /usr/share/common-licenses/GPL-2, or
+ <http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+ of the GNU General Public License.
diff --git a/client/debian/rhncfg/debian/docs b/client/debian/rhncfg/debian/docs
new file mode 100644
index 0000000..e69de29
diff --git a/client/debian/rhncfg/debian/pycompat b/client/debian/rhncfg/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/client/debian/rhncfg/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/client/debian/rhncfg/debian/rules b/client/debian/rhncfg/debian/rules
new file mode 100755
index 0000000..ee8513b
--- /dev/null
+++ b/client/debian/rhncfg/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+params=-f Makefile.rhncfg PLATFORM=deb PREFIX=$(CURDIR)/debian/rhncfg
+
+override_dh_auto_clean:
+ $(MAKE) $(params) clean
+override_dh_auto_build:
+ dh_auto_build -- $(params)
+override_dh_auto_install:
+ $(MAKE) $(params) install
+
+%:
+ dh $@
12 years, 8 months
rel-eng/packages
by Jan Pazdziora
rel-eng/packages/.README | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9ed89bc3f9c650197e56c603a37167abff1d8931
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 14 12:14:28 2011 +0200
We use tito tag instead of make tag-release for quite some time.
diff --git a/rel-eng/packages/.README b/rel-eng/packages/.README
index e0bbc6c..b73c00d 100644
--- a/rel-eng/packages/.README
+++ b/rel-eng/packages/.README
@@ -1,3 +1,3 @@
-Files in this directory are updated using make tag-minor-release
-or make tag-release called from directories of individual packages.
-To not modify them without knowing what your've doing.
+Files in this directory are updated using tito tag invoked from
+directories of individual packages.
+Do not modify these files manually without knowing what your've doing.
12 years, 8 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.6.4-1'
by Miroslav Suchý
Tag 'spacewalk-proxy-installer-1.6.4-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-09-13 14:01 +0000
Tagging package [spacewalk-proxy-installer] version [1.6.4-1] in directory [proxy/installer/].
Changes since perl-NOCpulse-Probe-1.184.11-1:
Miroslav Suchý (2):
require rhn-ssl-tool which can handle --set-cname option
Automatic commit of package [spacewalk-proxy-installer] release [1.6.4-1].
---
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 8 months
2 commits - proxy/installer rel-eng/packages
by Miroslav Suchý
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 0a40d5e852d8650d2b164359f582873f5f86a60f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 13 16:01:04 2011 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.6.4-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 13ff0bd..bf04231 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.6.3
+Version: 1.6.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE answers.txt
%changelog
+* Tue Sep 13 2011 Miroslav Suchý 1.6.4-1
+- require rhn-ssl-tool which can handle --set-cname option
+
* Mon Aug 29 2011 Miroslav Suchý 1.6.3-1
- check if "copy_extension=copy" is in correct section
- do not ask for SSL_CNAME if it set in answer file to empty array
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index 487369a..1ace36c 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.6.3-1 proxy/installer/
+1.6.4-1 proxy/installer/
commit ca76e1007e39dd636d1a74aaa3d430d782972d85
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Sep 13 15:59:36 2011 +0200
require rhn-ssl-tool which can handle --set-cname option
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 57c32a7..13ff0bd 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -18,6 +18,7 @@ Requires: rhncfg-actions
Requires: glibc-common
Requires: chkconfig
Requires: libxslt
+Requires: spacewalk-certs-tools >= 1.6.4
BuildRequires: /usr/bin/docbook2man
Obsoletes: proxy-installer < 5.3.0
Provides: proxy-installer = 5.3.0
12 years, 8 months