backend/spacewalk-backend.spec | 11
client/rhel/rhn-client-tools/doc/releases.txt | 296 ----------
client/rhel/rhn-client-tools/rhn-client-tools.spec | 14
client/tools/rhncustominfo/rhn-custom-info.spec | 7
client/tools/rhnpush/rhnpush.spec | 4
client/tools/rhnpush/uploadLib.py | 27
client/tools/spacewalk-koan/spacewalk-koan.spec | 5
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 2
java/spacewalk-java.spec | 28
monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec | 4
projects/python-gzipstream/python-gzipstream.spec | 2
projects/python-hwdata/python-hwdata.spec | 2
proxy/installer/spacewalk-proxy-installer.spec | 4
proxy/proxy/spacewalk-proxy.spec | 4
satellite/install/install.pl | 34 -
search-server/spacewalk-search/spacewalk-search.spec | 4
selinux/oracle-selinux/oracle-selinux.spec | 3
spacecmd/spacecmd.spec | 2
web/spacewalk-web.spec | 2
19 files changed, 34 insertions(+), 421 deletions(-)
New commits:
commit 18aa27f3697d883d747781776596116d2ea17b73
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 12:14:58 2011 +0200
Removing code for RHEL 4 specific ISO installation issues.
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 3b83221..03a737c 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -496,25 +496,12 @@ sub remove_obsoleted_packages {
my @pkgs = ('rhn-apache', 'rhn-modpython', 'rhn-modssl',
'rhn-modperl',
'perl-libapreq', 'bouncycastle-jdk1.4',
'quartz-oracle', 'jaf', 'jta');
- # If we're about to install xml-commons-jaxp-apis from ISO (on RHEL-4), we need to
- # remove xml-commons-apis first (dependency problems).
- push(@pkgs, 'xml-commons-apis') if
glob('Satellite/xml-commons-jaxp-apis*');
for my $pkg (@pkgs) {
if (system_debug('rpm', '-q', $pkg) == 0) {
system_debug('rpm', '-ev', '--nodeps', $pkg);
}
}
}
- if (glob("Satellite/mod_perl-*.rpm")) {
- # On RHEL 4, we ship our mod_perl but not mod_perl-devel. If mod_perl is
- # already installed, we will want to upgrade it but existing mod_perl-devel
- # would prevent that upgrade.
- for my $pkg ( 'mod_perl-devel' ) {
- if (system_debug('rpm', '-q', $pkg) == 0) {
- system_debug('rpm', '-ev', '--nodeps', $pkg);
- }
- }
- }
return 1;
}
commit 12f264eea90d440663932f2c011dc13f64251108
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 12:13:43 2011 +0200
We always have modular SELinux policy on RHEL (no longer building for RHEL 4-).
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index b1c0d5d..3b83221 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -163,8 +163,7 @@ EOQ
}
if (not $opts->{"skip-selinux-test"}) {
- if (have_semodule()) { # we have modular SELinux policy (RHEL 5)
- if (getenforce() eq 'Disabled') { # we should use it
+ if (getenforce() eq 'Disabled') { # we should use SELinux
print loc(<<EOH);
Red Hat recommends SELinux be configured in either Permissive or Enforcing
mode for your RHN Satellite installation. Run /usr/sbin/getenforce to see your
@@ -176,17 +175,6 @@ otherwise be run by the installer.
EOH
exit 3;
}
- } else { # we are on pre-modular SELinux sysatem (RHEL 4)
- if (getenforce() eq 'Enforcing') { # should not try run SELinux Enforcing
- print loc(<<EOH);
-SELinux must be in Disabled or Permissive mode for your RHN Satellite to
-install and function properly. Run /usr/sbin/getenforce to see your current
-mode. If you are certain that you are not in Enforcing mode you can re-run
-the installer with the flag --skip-selinux-test.
-EOH
- exit 3;
- }
- }
}
if (not $opts->{"skip-fqdn-test"}
@@ -232,13 +220,6 @@ sub correct_system_version {
return 1 if grep { $version_info{version} eq $_ } qw/5Server 6Server/;
}
-sub have_semodule {
- if (system('/usr/sbin/semodule -l > /dev/null 2>&1')) {
- return 0;
- }
- return 1;
-}
-
sub getenforce {
my $getenforce = `/usr/sbin/getenforce`;
chomp $getenforce;
commit 2a86b8692d54f0a1c896632de137e0449ec0362b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 12:06:45 2011 +0200
We always have rhnserver (no longer building for RHEL 4-).
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 5925105..15c255b 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -25,11 +25,7 @@ import struct
import xmlrpclib
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
-try:
- from up2date_client import rhnserver
- rhnserver_available = True
-except ImportError:
- rhnserver_available = False
+from up2date_client import rhnserver
try:
from rhn import rpclib
@@ -713,21 +709,12 @@ def getServer(uri, proxy=None, username=None, password=None,
ca_chain=None):
def exists_getPackageChecksumBySession(rpc_server):
""" check whether server supports getPackageChecksumBySession
function"""
- if rhnserver_available:
- # unfortunatelly we do not have capability for getPackageChecksumBySession
function,
- # but extended_profile in version 2 has been created just 2 months before
- # getPackageChecksumBySession lets use it instead
- server = rhnserver.RhnServer()
- server._server = rpc_server
- result =
server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
- else: # rhel4 has no rhnserver
- server_capabilities = rpc_server.get_server_capability()
- if 'xmlrpc.packages.extended_profile' in server_capabilities:
- # that capability can be '1' or '1-2', this is hackish
- result =
server_capabilities['xmlrpc.packages.extended_profile']['version'] >
'1' and \
-
server_capabilities['xmlrpc.packages.extended_profile']['value'] #
usually '1'
- else:
- result = False
+ # unfortunatelly we do not have capability for getPackageChecksumBySession function,
+ # but extended_profile in version 2 has been created just 2 months before
+ # getPackageChecksumBySession lets use it instead
+ server = rhnserver.RhnServer()
+ server._server = rpc_server
+ result =
server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
return result
# compare two package [n,v,r,e] tuples
commit cb20c4c11758e5ad4c5b1e4119d845d5f357bb9a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 11:50:12 2011 +0200
The rhn-client-tools/doc/releases.txt is out of date, removing.
diff --git a/client/rhel/rhn-client-tools/doc/releases.txt
b/client/rhel/rhn-client-tools/doc/releases.txt
deleted file mode 100644
index f65aa0f..0000000
--- a/client/rhel/rhn-client-tools/doc/releases.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-6.2:
- stock: none
- up2date-1.13-1.noarch.rpm (pre RHN)
-
- RHBA-2000:138-03:
- up2date-2.1.7-0.6.x.i386.rpm
- up2date-gnome-2.1.7-0.6.x.i386.rpm
- rhn_register-1.0.2-0.6.x.noarch.rpm
- rhn_register-gnome-1.0.2-0.6.x.noarch.rpm
- python-xmlrpc-1.2.1-0.6.x.i386.rpm
-
- RHBA-2001:048-05
- up2date-2.5.4-0.6.x.i386.rpm
- up2date-gnome-2.5.4-0.6.x.i386.rpm
- rhn_register-1.3.2-0.6.x.noarch.rpm
- rhn_register-gnome-1.3.2-0.6.x.noarch.rpm
- python-xmlrpc-1.4-0.6.x.i386.rpm
-
- RHBA-2001:119-19:
- up2date-2.7.11-6.x.1.i386.rpm
- up2date-gnome-2.7.11-6.x.1.i386.rpm
- rhn_register-2.7.2-6.x.8.i386.rpm
- rhn_register-gnome-2.7.2-6.x.8.i386.rpm
- python-xmlrpc-1.5.1-6.x.7.i386.rpm
- python-popt-0.6-1.i386.rpm
-
- RHBA-2002:044-12:
- up2date-2.7.46-6.x.1.i386.rpm
- up2date-gnome-2.7.46-6.x.1.i386.rpm
- rhn_register-2.7.9-6.x.1.i386.rpm
- rhn_register-gnome-2.7.9-6.x.1.i386.rpm
-
- RHBA-2002:050-07:
- up2date-2.7.61-6.x.1.i386.rpm
- up2date-gnome-2.7.61-6.x.1.i386.rpm
- rhn_register-2.7.9-6.x.2.i386.rpm
- rhn_register-gnome-2.7.9-6.x.2.i386.rpm
-
- RHBA-2002:140-25:
- up2date-2.8.39-1.6.2.i386.rpm
- up2date-gnome-2.8.39-1.6.2.i386.rpm
- rhn_register-2.8.27-1.6.2.i386.rpm
- rhn_register-gnome-2.8.27-1.6.2.i386.rpm
-
-7.0:
- stock:
- update-2.0.5-3
- up2date-gnome-2.0.5-3.i386.rpm
- rhn_register-1.0-7.noarch.rpm
- rhn_register-gnome-1.0-7.noarch.rpm
-
- RHBA-2000:138-03
- up2date-2.1.7-1.i386.rpm
- up2date-gnome-2.1.7-1.i386.rpm
- python-xmlrpc-1.2.1-1.alpha.rpm
-
- RHBA-2001:048-05
- up2date-2.5.4-1.i386.rpm
- up2date-gnome-2.5.4-1.gnome.rpm
- rhn_register-1.3.2-1.noarch.rpm
- rhn_register-gnome-1.3.2-1.noarch.rpm
- python-xmlrpc-1.4-1.i386.rpm
-
- RHBA-2001:119-19:
- up2date-2.7.11-7.x.1.i386.rpm
- up2date-gnome-2.7.11-7.x.1.i386.rpm
- rhn_register-2.7.2-7.x.8.i386.rpm
- rhn_register-gnome-2.7.2-7.x.8.i386.rpm
- python-xmlrpc-1.5.1-7.x.7.i386.rpm
- python-popt-0.6-4.i386.rpm
-
-
- RHBA-2002:044-12:
- up2date-2.7.46-7.x.1.i386.rpm
- up2date-gnome-2.7.46-7.x.1.i386.rpm
- rhn_register-2.7.9-7.x.1.i386.rpm
- rhn_register-gnome-2.7.9-7.x.1.i386.rpm
-
-
- RHBA-2002:050-07
- up2date-2.7.61-7.x.1.i386.rpm
- up2date-gnome-2.7.61-7.x.1.i386.rpm
- rhn_register-2.7.9-7.x.2.i386.rpm
- rhn_register-gnome-2.7.9-7.x.2.i386.rpm
-
- RHBA-2002:140-25:
- up2date-2.8.39-1.7.0.i386.rpm
- up2date-gnome-2.8.39-1.7.0.i386.rpm
- rhn_register-2.8.27-1.7.0.i386.rpm
- rhn_register-gnome-2.8.27-1.7.0.i386.rpm
-
-
-7.1:
- stock:
- up2date-2.5.2-1.i386.rpm
- up2date-gnome-2.5.2-1.i386.rpm
- rhn_register-1.3.1-1.noarch.rpm
- rhn_register-gnome-1.3.1-1.noarch.rpm
- python-xmlrpc-1.4-1.i386.rpm
-
- RHBA-2001:048-05:
- up2date-2.5.4-1.i386.rpm
- up2date-gnome-2.5.4-1.i386.rpm
- rhn_register-1.3.2-1.noarch.rpm
- rhn_register-gnome-1.3.2-1.noarch.rpm
-
- RHBA-2001:119-19:
- up2date-2.7.11-7.x.1.i386.rpm
- up2date-gnome-2.7.11-7.x.1.i386.rpm
- rhn_register-2.7.2-7.x.8.i386.rpm
- rhn_register-gnome-2.7.2-7.x.8.i386.rpm
- python-xmlrpc-1.5.1-7.x.3.i386.rpm
- python-popt-0.6-4.i386.rpm
-
-
- RHBA-2002:044-12:
- up2date-2.7.46-6.x.1.i386.rpm
- up2date-gnome-2.7.46-6.x.1.i386.rpm
- rhn_register-2.7.9-6.x.1.i386.rpm
- rhn_register-gnome-2.7.9-6.x.1.i386.rpm
-
-
- RHBA-2002:050-07
- up2date-2.7.61-7.x.1.i386.rpm
- up2date-gnome-2.7.61-7.x.1.i386.rpm
- rhn_register-2.7.9-7.x.2.i386.rpm
- rhn_register-gnome-2.7.9-7.x.2.i386.rpm
-
- RHBA-2002:140-25:
- up2date-2.8.39-1.7.1.i386.rpm
- up2date-gnome-2.8.39-1.7.1.i386.rpm
- rhn_register-2.8.27-1.7.1.i386.rpm
- rhn_register-gnome-2.8.27-1.7.1.i386.rpm
-
-
-7.2:
-
- stock:
- up2date-2.7.2-7.x.6.i386.rpm
- up2date-gnome-2.7.2-7.x.6.i386.rpm
- rhn_register-2.7.2-7.x.2.i386.rpm
- rhn_register-gnome-2.7.2-7.x.2.i386.rpm
- python-xmlrpc-1.5.0-1.i386.rpm
-
- RHBA-2001:119-19:
- up2date-2.7.11-7.x.1.i386.rpm
- up2date-gnome-2.7.11-7.x.1.i386.rpm
- rhn_register-2.7.2-7.x.8.i386.rpm
- rhn_register-gnome-2.7.2-7.x.8.i386.rpm
- python-xmlrpc-1.5.1-7.x.3.i386.rpm
- python-popt-0.6-4.i386.rpm
-
-
- RHBA-2002:044-12:
- up2date-2.7.46-7.x.2.i386.rpm
- up2date-gnome-2.7.46-7.x.2.i386.rpm
- rhn_register-2.7.9-7.x.2.i386.rpm
- rhn_register-gnome-2.7.9-7.x.2.i386.rpm
-
-
- RHBA-2002:050-07
- up2date-2.7.61-7.x.2.i386.rpm
- up2date-gnome-2.7.61-7.x.2.i386.rpm
- rhn_register-2.7.9-7.x.2.i386.rpm
- rhn_register-gnome-2.7.9-7.x.2.i386.rpm
-
- RHBA-2002:140-25:
- up2date-2.8.39-1.7.2.i386.rpm
- up2date-gnome-2.8.39-1.7.2.i386.rpm
- rhn_register-2.8.27-1.7.2.i386.rpm
- rhn_register-gnome-2.8.27-1.7.2.i386.rpm
-
-2.1AS:
- stock:
- up2date-2.7.61-7.x.2.i386.rpm
- up2date-gnome-2.7.61-7.x.2.i386.rpm
- rhn_register-2.7.9-7.x.2.i386.rpm
- rhn_register-gnome-2.7.9-7.x.2.i386.rpm
- python-xmlrpc-1.5.1-7.x.3.i386.rpm
- python-popt-0.8.8-7.x.2.i386.rpm
-
- qu2:
- up2date-2.8.45-1.2.1AS.i386.rpm
- up2date-gnome-2.8.45-1.2.1AS.i386.rpm
- rhn_register-2.8.32-1.2.1AS.i386.rpm
- rhn_register-gnome-2.8.32-1.2.1AS.i386.rpm
-
- RHSA-2003:268-00:
- up2date-2.8.46.3-1.2.1AS.i386.rpm
- up2date-gnome-2.8.46.3-1.2.1AS.i386.rpm
-
- qu3:
- up2date-2.9.3-2.2.1AS.i386.rpm
- up2date-gnome-2.9.3-2.2.1AS.i386.rpm
- rhn_register-2.9.2-1.2.1AS.i386.rpm
- rhn_register-gnome-2.9.2-1.2.1AS.i386.rpm
-
-
- qu4:
- rhn_register-2.9.3-1.2.1AS.src.rpm
- rhn_register-gnome-2.9.3-1.2.1AS.src.rpm
-
- qu5:
- up2date-2.9.14-1.2.1AS
- up2date-gnome-2.9.14-1.2.1AS
- rhn_register-2.9.12-1.2.1AS
- rhn_register-gnome-2.9.12-1.2.1AS
-
-7.3:
- stock:
- rhn_register-2.7.21-7.x.3.i386.rpm
- rhn_register-gnome-2.7.21-7.x.3.i386.rpm
- up2date-2.7.86-7.x.3.i386.rpm
- up2date-gnome-2.7.86-7.x.3.i386.rpm
- python-xmlrpc-1.5.1-7.x.3.i386.rpm
-
-
- RHBA-2002:050-07
- up2date-2.7.61-7.x.3.i386.rpm
- up2date-gnome-2.7.61-7.x.3.i386.rpm
- rhn_register-2.7.9-7.x.3.i386.rpm
- rhn_register-gnome-2.7.9-7.x.3.i386.rpm
-
- RHBA-2002:140-25:
- up2date-2.8.39-1.7.3.i386.rpm
- up2date-gnome-2.8.39-1.7.3.i386.rpm
- rhn_register-2.8.27-1.7.3.i386.rpm
- rhn_register-gnome-2.8.27-1.7.3.i386.rpm
-
-
-8.0:
- stock:
- up2date-3.0.7-1.i386.rpm
- up2date-gnome-3.0.7-1.i386.rpm
-
- RHSA-2003:255-00:
- up2date-3.0.7.2-1.i386.rpm
- up2date-gnome-3.0.7.2-1.i386.rpm
-
-9.0:
- stock:
- up2date-3.1.23-1.i386.rpm
- up2date-gnome-3.1.23-1.i386.rpm
-
- errata/ssl:
- up2date-3.1.23.2-1.i386.rpm
- up2date-gnome-3.1.23.2-1.i386.rpm
-
-
-RHEL3:
- stock: up2date-4.0.1-1.i386.rpm
- up2date-gnome-4.0.1-1.i386.rpm
-
- U1/RHBA-2003:377-06:
- up2date-4.2.5-1.i386.rpm
- up2date-gnome-4.2.5-1.i386.rpm
-
-
- U2:
- up2date-4.2.14-1.i386.rpm
- up2date-gnome-4.2.14-1.i386.rpm
-
- RHBA-2004:220-07:
- up2date-4.2.16-1.i386.rpm
- up2date-gnome-4.2.16-1.i386.rpm
-
- u3:
- up2date-4.2.38-1
- up2date-gnome-4.2.38-1
-
- u4: up2date-4.2.57-2.i386.rpm
- up2date-gnome-4.2.57-2.i386.rpm
- up2date-update-4.2.57-2.i386.rpm
-
- u6:
- up2date-4.4.44-3.i386.rpm
- up2date-gnome-4.4.44-3.i386.rpm
-RHEL4:
- stock:
- up2date-4.4.5-1.i386.rpm
- up2date-gnome-4.4.5-1.i386.rpm
-
- RHBA-2005-169:
- up2date-4.4.5.5-2
- up2date-gnome-4.4.5.5-2
-
- U2:
- up2date-4.4.50-4.i386.rpm
- up2date-gnome-4.4.50-4.i386.rpm
-
-
-
-
-
-
-
commit a940bf6f6705a2af90a06a7f41affa00c9bc87af
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 11:26:28 2011 +0200
We only support version 5 and newer of RHEL, removing conditions for old versions.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5e43d3f..58a6eb5 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -186,13 +186,8 @@ Summary: Spacewalk server and client tools libraries
Group: Applications/Internet
BuildRequires: python2-devel
Conflicts: %{name} < 0.8.28
-%if 0%{?rhel} && 0%{?rhel} < 5
-Requires: python-crypto
-BuildRequires: python-crypto
-%else
Requires: python-hashlib
BuildRequires: python-hashlib
-%endif
%description libs
Libraries required by both Spacewalk server and Spacewalk client tools.
@@ -251,11 +246,7 @@ Requires: PyXML
Requires: mod_ssl
Requires: %{name}-xml-export-libs
Requires: cobbler >= 1.4.3
-%if 0%{?rhel} && 0%{?rhel} < 5
-Requires: rhnlib >= 2.1.4-14
-%else
Requires: rhnlib >= 2.5.38
-%endif
Obsoletes: rhns-satellite-tools < 5.3.0
Obsoletes: spacewalk-backend-satellite-tools <= 0.2.7
Provides: spacewalk-backend-satellite-tools = %{version}-%{release}
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 5c67793..7200275 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -61,7 +61,7 @@ BuildRequires: desktop-file-utils
%if 0%{?fedora}
BuildRequires: fedora-logos
%endif
-%if 0%{?rhel} > 4
+%if 0%{?rhel}
BuildRequires: redhat-logos
%endif
diff --git a/client/tools/rhncustominfo/rhn-custom-info.spec
b/client/tools/rhncustominfo/rhn-custom-info.spec
index 84d434e..00430f4 100644
--- a/client/tools/rhncustominfo/rhn-custom-info.spec
+++ b/client/tools/rhncustominfo/rhn-custom-info.spec
@@ -9,10 +9,6 @@ Release: 1%{?dist}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel
-%if 0%{?rhel} && 0%{?rhel} <= 4
-BuildRequires: python
-Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
-%endif
Requires: rhnlib
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 1
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 052bf02..3665bad 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -13,11 +13,7 @@ BuildArch: noarch
Requires: rpm-python
Requires: rhnlib >= 2.5.38
Requires: spacewalk-backend-libs >= 0.8.3
-%if 0%{?rhel} && 0%{?rhel} < 5
-Requires: up2date
-%else
Requires: rhn-client-tools
-%endif
%if 0%{?suse_version}
# provides rhn directories for filelist check in OBS
BuildRequires: rhn-client-tools
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec
b/client/tools/spacewalk-koan/spacewalk-koan.spec
index 443b26f..5802feb 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -20,12 +20,7 @@ Conflicts: rhn-kickstart
Conflicts: rhn-kickstart-common
Conflicts: rhn-kickstart-virtualization
-#this currently doesn't work for RHEL 2.1
-%if 0%{?rhel} && 0%{?rhel} < 5
-Requires: up2date
-%else
Requires: rhn-check
-%endif
%description
Support package for spacewalk koan interaction.
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 54df8a2..f0fc18b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -98,12 +98,8 @@ BuildRequires: ant-nodeps
BuildRequires: antlr >= 0:2.7.6
BuildRequires: jpam
BuildRequires: tanukiwrapper
-%if 0%{?rhel} && 0%{?rhel} < 5
-BuildRequires: javamail
-%else
Requires: classpathx-mail
BuildRequires: classpathx-mail
-%endif
BuildRequires: checkstyle
# Sadly I need these to symlink the jars properly.
diff --git a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
index a542dc0..6538c6d 100644
--- a/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
+++ b/monitoring/spacewalk-proxy-monitoring/spacewalk-proxy-monitoring.spec
@@ -45,11 +45,7 @@ Requires: ssl_bridge
Requires: status_log_acceptor
Requires: tsdb
Requires: mod_perl
-%if 0%{?rhel} == 4
-#for rhel4 we have no selinux policy, everything else should have
-%else
Requires: spacewalk-monitoring-selinux
-%endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: np-config < 2.111.0
Provides: np-config = %{version}
diff --git a/proxy/installer/spacewalk-proxy-installer.spec
b/proxy/installer/spacewalk-proxy-installer.spec
index cbb2bf8..bc9840e 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -41,10 +41,6 @@ Run configure-proxy.sh after installation to configure proxy.
/usr/bin/gzip rhn-proxy-activate.8
/usr/bin/docbook2man configure-proxy.sh.sgml
/usr/bin/gzip configure-proxy.sh.8
-# default access_log is already set on RHEL4
-%if 0%{?rhel} == 4
-perl -i -pe 's/access_log \S+ squid//;' squid.conf
-%endif
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 8ae3a77..4924b06 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -32,11 +32,7 @@ Requires: %{name}-redirect = %{version}
Requires: %{name}-common >= %{version}
Requires: %{name}-docs
Requires: %{name}-html
-%if 0%{?rhel} == 4
-#for rhel4 we have no selinux policy, everything else should have
-%else
Requires: spacewalk-proxy-selinux
-%endif
Requires: jabberd spacewalk-setup-jabberd
Requires: httpd
Requires: sos
commit 998b73a2cf50f45bb590ed0e870f882cd5d7020c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 22 11:22:27 2011 +0200
We only support version 14 and newer of Fedora, removing conditions for old versions.
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a209229..5e43d3f 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -2,7 +2,7 @@
%global rhnconf %{_sysconfdir}/rhn
%global httpdconf %{rhnconf}/satellite-httpd/conf
%global apacheconfd %{_sysconfdir}/httpd/conf.d
-%if 0%{?fedora} < 13 && 0%{?rhel} < 6
+%if 0%{?rhel} && 0%{?rhel} < 6
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
%global pythonrhnroot %{python_sitelib}/spacewalk
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 18b86a8..5c67793 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -27,7 +27,7 @@ Requires: dbus-1-python
%else
Requires: dbus-python
%endif
-%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
Requires: python-gudev
Requires: python-hwdata
%else
@@ -66,7 +66,7 @@ BuildRequires: redhat-logos
%endif
# The following BuildRequires are for check only
-%if 0%{?fedora} >= 12
+%if 0%{?fedora}
BuildRequires: python-coverage
BuildRequires: rhnlib
BuildRequires: rpm-python
@@ -114,10 +114,8 @@ Requires: python-gnome python-gtk
Requires: pygtk2 pygtk2-libglade gnome-python2 gnome-python2-canvas
%endif
Requires: usermode-gtk
-%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
Requires: gnome-python2-gnome gnome-python2-bonobo
-%endif
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: liberation-sans-fonts
%endif
@@ -140,7 +138,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
-%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_hal.*
%else
rm $RPM_BUILD_ROOT%{_datadir}/rhn/up2date_client/hardware_gudev.*
@@ -179,7 +177,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%clean
rm -rf $RPM_BUILD_ROOT
-%if 0%{?fedora} >= 12
+%if 0%{?fedora}
%check
make -f Makefile.rhn-client-tools test
diff --git a/client/tools/rhncustominfo/rhn-custom-info.spec
b/client/tools/rhncustominfo/rhn-custom-info.spec
index 698de74..84d434e 100644
--- a/client/tools/rhncustominfo/rhn-custom-info.spec
+++ b/client/tools/rhncustominfo/rhn-custom-info.spec
@@ -9,9 +9,6 @@ Release: 1%{?dist}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: python-devel
-%if 0%{?fedora} == 13
-Requires: python-abi = 2.6
-%endif
%if 0%{?rhel} && 0%{?rhel} <= 4
BuildRequires: python
Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]")
diff --git a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
index c78681d..5cde992 100644
--- a/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
+++ b/client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec
@@ -1,4 +1,4 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d453860..54df8a2 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -60,8 +60,8 @@ Requires: jta
Requires: log4j
Requires: redstone-xmlrpc
Requires: oscache
-# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
+# EL5 = Struts 1.2 and Tomcat 5, EL6+/recent Fedoras = 1.3 and Tomcat 6
+%if 0%{?rhel} && 0%{?rhel} < 6
Requires: tomcat5
Requires: jasper5
Requires: tomcat5-servlet-2.4-api
@@ -84,7 +84,7 @@ Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
Requires: jpackage-utils >= 0:1.5
Requires: cobbler >= 2.0.0
-%if 0%{?fedora} >= 14
+%if 0%{?fedora}
Requires: apache-commons-logging
%else
Requires: jakarta-commons-logging
@@ -133,8 +133,8 @@ BuildRequires: oscache
BuildRequires: quartz
BuildRequires: simple-core
BuildRequires: stringtree-json
-# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
+# EL5 = Struts 1.2 and Tomcat 5, EL6+/recent Fedoras = 1.3 and Tomcat 6
+%if 0%{?rhel} && 0%{?rhel} < 6
BuildRequires: struts >= 0:1.2.9
BuildRequires: jsp
BuildRequires: jasper5
@@ -146,7 +146,7 @@ BuildRequires: tomcat6-lib
%endif
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc
-%if 0%{?fedora} && 0%{?fedora} >= 13
+%if 0%{?fedora}
# spelling checker is only for Fedoras (no aspell in RHEL6)
BuildRequires: aspell aspell-en libxslt
%endif
@@ -240,7 +240,7 @@ Requires: jakarta-commons-lang >= 0:2.1
Requires: jakarta-commons-cli
Requires: jakarta-commons-codec
Requires: jakarta-commons-dbcp
-%if 0%{?fedora} >= 14
+%if 0%{?fedora}
Requires: apache-commons-logging
%else
Requires: jakarta-commons-logging
@@ -293,7 +293,7 @@ fi
ant -Dprefix=$RPM_BUILD_ROOT init-install compile
# checkstyle is broken on Fedora 14 - we skip for now
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
+%if 0%{?rhel} && 0%{?rhel} < 6
echo "Running checkstyle on java main sources"
export CLASSPATH="build/classes"
export BASE_OPTIONS="-Djavadoc.method.scope=public \
@@ -370,7 +370,7 @@ touch $RPM_BUILD_ROOT%{_var}/spacewalk/systemlogs/audit-review.log
# Fedoras have cglib version that is not compatible with asm and need objectweb-asm
# Unfortunately both libraries must be installed for dependencies so we override
# the asm symlink with objectweb-asm here
-%if 0%{?fedora} >= 13
+%if 0%{?fedora}
ln -s -f %{_javadir}/objectweb-asm/asm-all.jar $RPM_BUILD_ROOT%{jardir}/asm_asm.jar
ln -s -f %{_javadir}/objectweb-asm/asm-all.jar
$RPM_BUILD_ROOT%{_datadir}/rhn/lib/spacewalk-asm.jar
%else
@@ -482,7 +482,7 @@ fi
#%{jardir}/asmasm-xml.jar
#%{jardir}/asmkasm.jar
-%if 0%{?fedora} && 0%{?fedora} >= 13
+%if 0%{?fedora}
# jfreechart-1.0.10-4.fc13.noarch (F13)
# jfreechart-1.0.13-1.fc14.noarch (F14)
%{jardir}/jfreechart_jfreechart.jar
@@ -494,8 +494,8 @@ fi
%{jardir}/jfreechart.jar
%endif
-# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
+# EL5 = Struts 1.2 and Tomcat 5, EL6+/recent Fedoras = 1.3 and Tomcat 6
+%if 0%{?rhel} && 0%{?rhel} < 6
%{jardir}/struts.jar
%else
%{jardir}/struts.jar
diff --git a/projects/python-gzipstream/python-gzipstream.spec
b/projects/python-gzipstream/python-gzipstream.spec
index 1437ec5..7eaed05 100644
--- a/projects/python-gzipstream/python-gzipstream.spec
+++ b/projects/python-gzipstream/python-gzipstream.spec
@@ -1,4 +1,4 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
diff --git a/projects/python-hwdata/python-hwdata.spec
b/projects/python-hwdata/python-hwdata.spec
index 8db2945..3024ad3 100644
--- a/projects/python-hwdata/python-hwdata.spec
+++ b/projects/python-hwdata/python-hwdata.spec
@@ -1,4 +1,4 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%endif
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index 7a9fd83..2d0b3a8 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -22,7 +22,7 @@ Requires: jakarta-commons-cli
Requires: jakarta-commons-codec
Requires: jakarta-commons-httpclient
Requires: jakarta-commons-lang >= 0:2.1
-%if 0%{?fedora} >= 14
+%if 0%{?fedora}
Requires: apache-commons-logging
%else
Requires: jakarta-commons-logging
@@ -43,7 +43,7 @@ BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-httpclient
BuildRequires: jakarta-commons-lang >= 0:2.1
-%if 0%{?fedora} >= 14
+%if 0%{?fedora}
BuildRequires: apache-commons-logging
%else
BuildRequires: jakarta-commons-logging
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index 2d8a517..0bba572 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -53,9 +53,6 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy-base >= 2.4.6-267
%endif
-%if 0%{?fedora} == 13
-Requires: selinux-policy-targeted >= 3.7.19-76
-%endif
Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon,
/usr/sbin/selinuxenabled
Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
Conflicts: oracle-selinux
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index db9c2a0..9e65325 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -1,4 +1,4 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%if ! (0%{?fedora} || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4de3a40..8117991 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -50,7 +50,7 @@ database. This includes RHN::* and RHN::DB::*
Summary: Minimal .pm's for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
-%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} <
13)
+%if 0%{?rhel} && 0%{?rhel} < 6
Requires: tomcat5
%else
Requires: tomcat6