backend/spacewalk-backend.spec | 1
java/spacewalk-java.spec | 29 ++++++++++++++++--
spacewalk/package/spacewalk.spec | 61 ++++++++++++++++++++++++++++++++++++---
3 files changed, 83 insertions(+), 8 deletions(-)
New commits:
commit 89e7033ca769fb1b00e95b5b4592b4283880c1b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:29:47 2009 +0200
Let's change codename to something new and novel.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index ead46e3..ac256cb 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,4 +1,4 @@
-%define release_name Alpha
+%define release_name Gemini
Name: spacewalk
Version: 0.7.0
commit a28068fe0a9336896ae2c42310726463f0b1219a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Sep 1 13:21:38 2009 +0200
Removed %%files - we don't want to build spacewalk package.
From now the main package is spacewalk-oracle or spacewalk-postgresql
depending on choosen db backend.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index f11a567..ead46e3 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,4 +1,5 @@
%define release_name Alpha
+
Name: spacewalk
Version: 0.7.0
Release: 1%{?dist}
@@ -141,11 +142,9 @@ echo "Spacewalk release %{version} (%{release_name})" >
$RPM_BUILD_ROOT/%{_sysco
%clean
rm -rf %{buildroot}
-%files
-%defattr(-,root,root)
-/%{_sysconfdir}/spacewalk-release
-
%files common
+%defattr(-,root,root)
+%{_sysconfdir}/spacewalk-release
%files oracle
commit 58b5384fa5c9dac069d81e45417d62b830779ce8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 16:02:51 2009 +0200
added java/database specific subpackages
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 686a193..f11a567 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -101,6 +101,7 @@ Conflicts: spacewalk-postgresql
Requires: oracle-instantclient-basic >= 10.2.0
Requires: oracle-instantclient-sqlplus >= 10.2.0
+Requires: spacewalk-java-oracle
Requires: perl(DBD::Oracle)
Requires: cx_Oracle
@@ -117,6 +118,7 @@ Obsoletes: spacewalk < 0.7.0
Requires: spacewalk-common = %{version}-%{release}
Conflicts: spacewalk-oracle
+Requires: spacewalk-java-postgresql
Requires: perl(DBD::Pg)
Requires: python-pgsql
commit 9ad27b58661e780f3c824b144bdf36ab8b012417
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 15:59:02 2009 +0200
moved database specific files to subpackages
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2f06fc4..21416ac 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -41,7 +41,6 @@ Requires: jta
Requires: log4j
Requires: redstone-xmlrpc
Requires: oscache
-Requires: ojdbc14
Requires: servletapi5
Requires: struts >= 0:1.2.9
Requires: tomcat5
@@ -51,9 +50,9 @@ Requires: sitemesh
Requires: stringtree-json
Requires: spacewalk-java-config
Requires: spacewalk-java-lib
+Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
Requires: jpackage-utils >= 0:1.5
-Requires: postgresql-jdbc
Requires: cobbler >= 1.6.3
BuildRequires: ant
BuildRequires: ant-apache-regexp
@@ -131,6 +130,24 @@ Provides: rhn-java-lib-sat = %{version}-%{release}
This package contains the jar files for the Spacewalk Java web application
and taskomatic process.
+%package oracle
+Summary: Oracle database backend support files for Spacewalk Java
+Group: Applications/Internet
+Requires: ojdbc14
+Provides: spacewalk-java-jdbc = %{version}-%{release}
+
+%description oracle
+This package contains Oracle database backend files for the Spacewalk Java.
+
+%package postgresql
+Summary: PostgreSQL database backend support files for Spacewalk Java
+Group: Applications/Internet
+Requires: postgresql-jdbc
+Provides: spacewalk-java-jdbc = %{version}-%{release}
+
+%description postgresql
+This package contains PostgreSQL database backend files for the Spacewalk Java.
+
%package -n spacewalk-taskomatic
Summary: Java version of taskomatic
Group: Applications/Internet
@@ -150,12 +167,12 @@ Requires: jfreechart >= 0:1.0.9
Requires: jpam
Requires: log4j
Requires: oscache
-Requires: ojdbc14
Requires: xalan-j2 >= 0:2.6.0
Requires: xerces-j2
Requires: tanukiwrapper
Requires: spacewalk-java-config
Requires: spacewalk-java-lib
+Requires: spacewalk-java-jdbc
Requires: concurrent
Requires: quartz
Requires: cobbler >= 1.6.3
@@ -256,6 +273,12 @@ fi
%attr(644, root, root) %{_datadir}/rhn/classes/log4j.properties
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
+%files oracle
+%{jardir}/ojdbc14.jar
+
+%files postgresql
+%{jardir}/postgresql-jdbc.jar
+
%changelog
* Thu Aug 20 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.7.2-1
- fix duplicate base channels listed in the "Parent Channel" dropdown
(jesusr(a)redhat.com)
commit c918fc0ec25f04350bc617ece9f770b589da9afd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:23:01 2009 +0200
added missing %%files sections
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 2451d11..686a193 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -143,6 +143,12 @@ rm -rf %{buildroot}
%defattr(-,root,root)
/%{_sysconfdir}/spacewalk-release
+%files common
+
+%files oracle
+
+%files postgresql
+
%changelog
* Mon Jul 27 2009 Devan Goodwin <dgoodwin(a)redhat.com> 0.6.4-1
- Re-enable spacewalk-monitoring-selinux dependency for F11.
commit d44829e4303407cca1888f499702c8643a415eb9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:05:31 2009 +0200
postgresql dependency moved to spacewalk-postgresql
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fea3df8..20d0ac9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -17,7 +17,6 @@ Requires: python, rpm-python
# /etc/rhn is provided by spacewalk-proxy-common or by spacewalk-config
Requires: /etc/rhn
Requires: rhnlib >= 1.8
-Requires: python-pgsql
BuildRequires: /usr/bin/msgfmt
BuildRequires: /usr/bin/docbook2man
BuildRequires: docbook-utils
commit 5f57f4ffa3e4255e7e6ffb109a290d13499ede65
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Aug 31 14:02:16 2009 +0200
split spacewalk metapackage into spacewalk-oracle/postgresql so we can
install only one database backend
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 3b361b4..2451d11 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -8,6 +8,18 @@ Group: Applications/Internet
License: GPLv2
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
+
+%description
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package common
+Summary: Spacewalk Systems Management Application with Oracle database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+
BuildRequires: python
Requires: python >= 2.3
Requires: spacewalk-setup
@@ -74,7 +86,41 @@ Requires: spacewalk-selinux
%endif
-%description
+%description common
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package oracle
+Summary: Spacewalk Systems Management Application with Oracle database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+Requires: spacewalk-common = %{version}-%{release}
+Conflicts: spacewalk-postgresql
+
+Requires: oracle-instantclient-basic >= 10.2.0
+Requires: oracle-instantclient-sqlplus >= 10.2.0
+Requires: perl(DBD::Oracle)
+Requires: cx_Oracle
+
+%description oracle
+Spacewalk is a systems management application that will
+inventory, provision, update and control your Linux and
+Solaris machines.
+
+%package postgresql
+Summary: Spacewalk Systems Management Application with PostgreSQL database backend
+Group: Applications/Internet
+License: GPLv2
+Obsoletes: spacewalk < 0.7.0
+Requires: spacewalk-common = %{version}-%{release}
+Conflicts: spacewalk-oracle
+
+Requires: perl(DBD::Pg)
+Requires: python-pgsql
+
+%description postgresql
Spacewalk is a systems management application that will
inventory, provision, update and control your Linux and
Solaris machines.