Changes to 'refs/tags/rhnmd-5.3.16-1'
by Michael Mraka
Tag 'rhnmd-5.3.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 15:48 +0000
Tagging package [rhnmd] version [5.3.16-1] in directory [monitoring/rhnmd/].
Changes since nocpulse-common-2.2.7-1:
Michael Mraka (1):
Automatic commit of package [rhnmd] release [5.3.16-1].
---
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 3 months
projects/oracle-server-scripts rel-eng/packages
by Michael Mraka
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9408dd59026b205e27ee3b2e73b007ac6a113f1d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:48:45 2013 +0100
Automatic commit of package [oracle-server-scripts] release [10.2.0.60-1].
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index 75b2a01..152a5c3 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -8,7 +8,7 @@
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
-Version: 10.2.0.59
+Version: 10.2.0.60
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: Proprietary
@@ -88,6 +88,9 @@ exit 0
%{oracle_scripts}
%changelog
+* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.60-1
+- 919468 - fixed path in file based Requires
+
* Fri Mar 08 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 10.2.0.59-1
- Fedora 19 does not provide /sbin/runuser
- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
diff --git a/rel-eng/packages/oracle-server-scripts b/rel-eng/packages/oracle-server-scripts
index 6d6154c..04bc117 100644
--- a/rel-eng/packages/oracle-server-scripts
+++ b/rel-eng/packages/oracle-server-scripts
@@ -1 +1 @@
-10.2.0.59-1 projects/oracle-server-scripts/
+10.2.0.60-1 projects/oracle-server-scripts/
11 years, 3 months
Changes to 'refs/tags/oracle-server-scripts-10.2.0.60-1'
by Michael Mraka
Tag 'oracle-server-scripts-10.2.0.60-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 15:48 +0000
Tagging package [oracle-server-scripts] version [10.2.0.60-1] in directory [projects/oracle-server-scripts/].
Changes since nocpulse-common-2.2.7-1:
Michael Mraka (2):
Automatic commit of package [rhnmd] release [5.3.16-1].
Automatic commit of package [oracle-server-scripts] release [10.2.0.60-1].
---
monitoring/rhnmd/rhnmd.spec | 6 +++++-
projects/oracle-server-scripts/oracle-server-scripts.spec | 5 ++++-
rel-eng/packages/oracle-server-scripts | 2 +-
rel-eng/packages/rhnmd | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
---
11 years, 3 months
monitoring/rhnmd rel-eng/packages
by Michael Mraka
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ac10798f9f6e6b1739d5c56b7b725cf89647e2dc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:48:15 2013 +0100
Automatic commit of package [rhnmd] release [5.3.16-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index f97c9a3..d791313 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -9,7 +9,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.15
+Version: 5.3.16
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -188,6 +188,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.3.16-1
+- 919468 - fixed path in file based Requires
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Fri Jan 04 2013 Jan Pazdziora 5.3.15-1
- We may need to define the port 4545 as ours to use.
- The daemon does success for us.
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 3a6aa1d..4e0478d 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.15-1 monitoring/rhnmd/
+5.3.16-1 monitoring/rhnmd/
11 years, 3 months
Changes to 'refs/tags/osad-5.11.19-1'
by Michael Mraka
Tag 'osad-5.11.19-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 15:43 +0000
Tagging package [osad] version [5.11.19-1] in directory [client/tools/osad/].
Changes since spacewalk-branding-1.10.10-1:
Michael Mraka (2):
919468 - fixed path in file based Requires
Automatic commit of package [osad] release [5.11.19-1].
---
client/tools/osad/osad.spec | 11 ++-
monitoring/nocpulse-common/nocpulse-common.spec | 10 +--
monitoring/rhnmd/rhnmd.spec | 5 -
projects/oracle-server-scripts/oracle-server-scripts.spec | 13 +--
projects/perl-Satcon/perl-Satcon.spec | 4 -
rel-eng/packages/osad | 2
schema/spacewalk/spacewalk-schema.spec | 4 -
selinux/jabberd-selinux/jabberd-selinux.spec | 9 +-
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 21 +++---
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 14 ++--
selinux/oracle-selinux/oracle-selinux.spec | 33 +++++-----
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 13 ++-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 13 ++-
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 9 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 9 +-
spacewalk/setup/spacewalk-setup.spec | 4 -
web/spacewalk-web.spec | 8 --
17 files changed, 96 insertions(+), 86 deletions(-)
---
11 years, 3 months
Changes to 'refs/tags/nocpulse-common-2.2.7-1'
by Michael Mraka
Tag 'nocpulse-common-2.2.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 15:43 +0000
Tagging package [nocpulse-common] version [2.2.7-1] in directory [monitoring/nocpulse-common/].
Changes since spacewalk-branding-1.10.10-1:
Michael Mraka (3):
919468 - fixed path in file based Requires
Automatic commit of package [osad] release [5.11.19-1].
Automatic commit of package [nocpulse-common] release [2.2.7-1].
---
client/tools/osad/osad.spec | 11 ++-
monitoring/nocpulse-common/nocpulse-common.spec | 15 ++--
monitoring/rhnmd/rhnmd.spec | 5 -
projects/oracle-server-scripts/oracle-server-scripts.spec | 13 +--
projects/perl-Satcon/perl-Satcon.spec | 4 -
rel-eng/packages/nocpulse-common | 2
rel-eng/packages/osad | 2
schema/spacewalk/spacewalk-schema.spec | 4 -
selinux/jabberd-selinux/jabberd-selinux.spec | 9 +-
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 21 +++---
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 14 ++--
selinux/oracle-selinux/oracle-selinux.spec | 33 +++++-----
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 13 ++-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 13 ++-
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 9 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 9 +-
spacewalk/setup/spacewalk-setup.spec | 4 -
web/spacewalk-web.spec | 8 --
18 files changed, 101 insertions(+), 88 deletions(-)
---
11 years, 3 months
2 commits - client/tools monitoring/nocpulse-common monitoring/rhnmd projects/oracle-server-scripts projects/perl-Satcon rel-eng/packages schema/spacewalk selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux spacewalk/setup web/spacewalk-web.spec
by Michael Mraka
client/tools/osad/osad.spec | 11 ++-
monitoring/nocpulse-common/nocpulse-common.spec | 10 +--
monitoring/rhnmd/rhnmd.spec | 5 -
projects/oracle-server-scripts/oracle-server-scripts.spec | 13 +--
projects/perl-Satcon/perl-Satcon.spec | 4 -
rel-eng/packages/osad | 2
schema/spacewalk/spacewalk-schema.spec | 4 -
selinux/jabberd-selinux/jabberd-selinux.spec | 9 +-
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 21 +++---
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 14 ++--
selinux/oracle-selinux/oracle-selinux.spec | 33 +++++-----
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 13 ++-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 13 ++-
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 9 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 9 +-
spacewalk/setup/spacewalk-setup.spec | 4 -
web/spacewalk-web.spec | 8 --
17 files changed, 96 insertions(+), 86 deletions(-)
New commits:
commit 59e843b7303e6b86d32d2691ee26edd76dc76f34
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:43:09 2013 +0100
Automatic commit of package [osad] release [5.11.19-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 2254283..4c30459 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.18
+Version: 5.11.19
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -351,6 +351,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.19-1
+- 919468 - fixed path in file based Requires
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Thu Feb 28 2013 Jan Pazdziora 5.11.18-1
- Removing the dsn parameter from initDB, removing support for --db option.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index bcff96d..78a61a1 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.18-1 client/tools/osad/
+5.11.19-1 client/tools/osad/
commit 20460363e95e901897c313088d40020bbde2e5a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:39:03 2013 +0100
919468 - fixed path in file based Requires
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 9a85be6..2254283 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -1,6 +1,7 @@
%global rhnroot /usr/share/rhn
%global rhnconf /etc/sysconfig/rhn
%global client_caps_dir /etc/sysconfig/rhn/clientCaps.d
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%if 0%{?suse_version}
%global apache_group www
@@ -115,8 +116,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-114
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled, /usr/sbin/semanage
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage, spacewalk-selinux
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled, /usr/sbin/semanage
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/semanage, spacewalk-selinux
Requires: osa-dispatcher
%description -n osa-dispatcher-selinux
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index c4371c5..2645e3b 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: nocpulse-common
Version: 2.2.6
Release: 1%{?dist}
@@ -10,11 +12,7 @@ Group: Applications/System
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): httpd, /usr/sbin/useradd
Requires(post): openssh
-%if 0%{?fedora} > 17
-Requires(post): %{_sbindir}/runuser
-%else
-Requires(post): /sbin/runuser
-%endif
+Requires(post): %{sbinpath}/runuser
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# merging this two packages together
# not backward compatible => no Provides:
@@ -132,7 +130,7 @@ fi
if [ ! -f %{identity} ]
then
- /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
+ %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
fi
%files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 749d751..f97c9a3 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,6 @@
%global np_name nocpulse
%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%if 0%{!?_initddir:1}
%global _initddir %{_sysconfdir}/rc.d/init.d
%endif
@@ -46,7 +47,7 @@ Obsoletes: rhnmd.x86_64 < 5.3.0-5
Provides: rhnmd.i386 = %{version}
Provides: rhnmd.x86_64 = %{version}
-Requires(post): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon
Requires(preun): /usr/sbin/semanage
%description
@@ -123,7 +124,7 @@ fi
%if !0%{?suse_version}
if [ ! -f %{identity} ]
then
- /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
+ %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
fi
%endif
%if 0%{?suse_version} >= 1210
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index fb109e9..75b2a01 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -4,7 +4,7 @@
%define oracle_admin %{oracle_base}/admin/%{oracle_base_version}
%define oracle_config %{oracle_base}/config/%{oracle_base_version}
%define oracle_scripts %{oracle_base}/scripts/%{oracle_base_version}
-
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
@@ -18,13 +18,8 @@ Buildroot: /var/tmp/%{name}-root
Requires: oracle-server >= %{oracle_base_version}
Requires: m4
Requires: oracle-config
-%if 0%{?fedora} > 17
-Requires(post): %{_sbindir}/runuser
-Requires: %{_sbindir}/restorecon
-%else
-Requires(post): /sbin/runuser
-Requires: /sbin/restorecon
-%endif
+Requires(post): %{sbinpath}/runuser
+Requires: %{sbinpath}/restorecon
%description
Management scripts for Oracle
@@ -73,7 +68,7 @@ fi
# setup environment for oracle user
[ -f %{oracle_base}/.bash_profile ] \
&& chown oracle.dba %{oracle_base}/.bash_profile
-/sbin/runuser - oracle -c 'cat - >>.bash_profile' <<EOP
+%{sbinpath}/runuser - oracle -c 'cat - >>.bash_profile' <<EOP
# entries added by the %{name} install script
# setup environment for embedded db
diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec
index 5b541ad..8b602eb 100644
--- a/projects/perl-Satcon/perl-Satcon.spec
+++ b/projects/perl-Satcon/perl-Satcon.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: perl-Satcon
Summary: Framework for configuration files
Version: 1.19
@@ -10,7 +12,7 @@ BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRequires: perl(ExtUtils::MakeMaker)
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
%description
Framework for generating config files during installation.
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 71589c3..775576c 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
@@ -14,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(Digest::SHA)
BuildRequires: python
BuildRequires: /usr/bin/pod2man
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
Obsoletes: rhn-satellite-schema <= 5.1.0
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 00b9e4d..3601aee 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -1,6 +1,7 @@
%global selinux_variants mls strict targeted
%global selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%global POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%global moduletype apps
%global modulename jabber
@@ -26,8 +27,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-114
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: jabberd >= 2.2.8
%description
@@ -80,7 +81,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
+ rpm -ql jabberd | xargs -n 1 %{sbinpath}/restorecon -ri {} || :
fi
%postun
@@ -95,7 +96,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage port -d -t jabber_interserver_port_t -p tcp 5347 || :
fi
-rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
+rpm -ql jabberd | xargs -n 1 %{sbinpath}/restorecon -ri {} || :
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
index 90cf212..82e329a 100644
--- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
+++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
@@ -1,3 +1,4 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: oracle-instantclient-selinux
Version: 11.2.0.1
@@ -14,8 +15,8 @@ URL: http://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, %{sbinpath}/restorecon
Requires: oracle-instantclient11.2-basic
Requires: oracle-nofcontext-selinux
@@ -27,8 +28,8 @@ Summary: SELinux support for Oracle Instant Client sqlplus
Group: System Environment/Base
Requires: oracle-instantclient11.2-sqlplus
Requires: oracle-nofcontext-selinux
-Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, %{sbinpath}/restorecon
%description -n oracle-instantclient-sqlplus-selinux
SELinux support for Oracle Instant Client sqlplus.
@@ -50,7 +51,7 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/%{name}-enable
for i in %used_libs ; do
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/'${i//./\\.}
done
-/sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+%{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
EOS
@@ -60,7 +61,7 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/oracle-instantclient-sqlplus-selinux-enabl
/usr/sbin/semanage fcontext -a -t oracle_sqlplus_exec_t '/usr/lib/oracle/11\.2/client.*/bin/sqlplus'
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplus\.so'
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplusic\.so'
-/sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+%{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
EOS
@@ -75,7 +76,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%postun
@@ -83,7 +84,7 @@ if [ $1 -eq 0 ]; then
for i in %used_libs ; do
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/'${i//./\\.}
done
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%post -n oracle-instantclient-sqlplus-selinux
@@ -94,7 +95,7 @@ fi
%posttrans -n oracle-instantclient-sqlplus-selinux
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%postun -n oracle-instantclient-sqlplus-selinux
@@ -102,7 +103,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage fcontext -d -t oracle_sqlplus_exec_t '/usr/lib/oracle/11\.2/client.*/bin/sqlplus'
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplus\.so'
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplusic\.so'
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%files
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 7b4bce5..a35d91e 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -1,4 +1,4 @@
-
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define moduletype apps
@@ -21,8 +21,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: oracle-server >= 10.2.0.3
Requires: oracle-nofcontext-selinux
@@ -77,9 +77,9 @@ fi
#this may be safely removed when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Fix up oracle-server-arch files
- rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin/restorecon -Riv
+ rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 %{sbinpath}/restorecon -Riv
# Fix up database files
- /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || :
+ %{sbinpath}/restorecon -rvi /rhnsat /var/tmp/.oracle || :
fi
%postun
@@ -93,10 +93,10 @@ if [ $1 -eq 0 ]; then
done
# Clean up oracle-server-arch files
- rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin/restorecon -Riv
+ rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 %{sbinpath}/restorecon -Riv
# Clean up any remaining file contexts (shouldn't be any really)
- /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || :
+ %{sbinpath}/restorecon -rvi /rhnsat /var/tmp/.oracle || :
fi
%files
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 038da9e..dbcd486 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -9,6 +9,7 @@
%define modulename oracle
%define moduletype apps
%define default_oracle_base /opt/oracle
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
#
# tag to be used in release to differentiate rpms with the same policy but
@@ -33,8 +34,8 @@ BuildArch: noarch
%if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
-Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
+Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
Obsoletes: oracle-10gR2-selinux
%description
@@ -49,8 +50,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy-base >= 2.4.6-267
%endif
-Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
Conflicts: oracle-selinux
%description -n oracle-nofcontext-selinux
@@ -128,19 +129,19 @@ SEPORT_STATUS=`semanage port -l | grep -c ^oracle`
test ${SEPORT_STATUS} -lt 1 && semanage port -a -t oracle_port_t -p tcp 1521 || :
# Fix up non-standard file contexts
-/sbin/restorecon -R -v %{oracle_base} || :
-/sbin/restorecon -R -v /u0? || :
-/sbin/restorecon -R -v /etc || :
-/sbin/restorecon -R -v /var/tmp || :
+%{sbinpath}/restorecon -R -v %{oracle_base} || :
+%{sbinpath}/restorecon -R -v /u0? || :
+%{sbinpath}/restorecon -R -v /etc || :
+%{sbinpath}/restorecon -R -v /var/tmp || :
%posttrans
#this may be safely removed when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Fix up non-standard file contexts
- /sbin/restorecon -R -v %{oracle_base} || :
- /sbin/restorecon -R -v /u0? || :
- /sbin/restorecon -R -v /etc || :
- /sbin/restorecon -R -v /var/tmp || :
+ %{sbinpath}/restorecon -R -v %{oracle_base} || :
+ %{sbinpath}/restorecon -R -v /u0? || :
+ %{sbinpath}/restorecon -R -v /etc || :
+ %{sbinpath}/restorecon -R -v /var/tmp || :
fi
%post -n oracle-nofcontext-selinux
@@ -172,10 +173,10 @@ if [ $1 -eq 0 ]; then
done
# Clean up any remaining file contexts (shouldn't be any really)
[ -d %{oracle_base} ] && \
- /sbin/restorecon -R -v %{oracle_base} &> /dev/null || :
- /sbin/restorecon -R -v /u0? || :
- /sbin/restorecon -R -v /etc || :
- /sbin/restorecon -R -v /var/tmp || :
+ %{sbinpath}/restorecon -R -v %{oracle_base} &> /dev/null || :
+ %{sbinpath}/restorecon -R -v /u0? || :
+ %{sbinpath}/restorecon -R -v /etc || :
+ %{sbinpath}/restorecon -R -v /var/tmp || :
fi
%postun -n oracle-nofcontext-selinux
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index b5a32e0..870fdb6 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -3,6 +3,7 @@
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define moduletype apps
%define modulename oracle-xe
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: oracle-xe-selinux
Version: 10.2.0.33
@@ -24,8 +25,8 @@ BuildArch: noarch
%if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/ldconfig, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, %{sbinpath}/ldconfig, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: /etc/init.d/oracle-xe
Requires: oracle-nofcontext-selinux
Requires: oracle-lib-compat
@@ -105,9 +106,9 @@ fi
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Relabel oracle-xe-univ/oracle-xe's files
- rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 %{sbinpath}/restorecon -Rivv
# Fix up additional directories, not owned by oracle-xe-univ/oracle-xe
- /sbin/restorecon -Rivv %extra_restorecon
+ %{sbinpath}/restorecon -Rivv %extra_restorecon
fi
%postun
@@ -124,10 +125,10 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage port -d -t oracle_port_t -p tcp 9055 || :
# Clean up oracle-xe-univ/oracle-xe's files
- rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 %{sbinpath}/restorecon -Rivv
# Clean up additional directories, not owned by oracle-xe-univ/oracle-xe
- /sbin/restorecon -Rivv %extra_restorecon
+ %{sbinpath}/restorecon -Rivv %extra_restorecon
fi
%files
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index 6b8e240..63badf4 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk-monitoring
@@ -31,8 +32,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: nocpulse-common
Requires: nocpulse-db-perl
Requires: eventReceivers
@@ -117,8 +118,8 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
- /sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
+ %{sbinpath}/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
+ %{sbinpath}/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
fi
%postun
@@ -131,8 +132,8 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvi /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
-/sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
+%{sbinpath}/restorecon -rvi /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
+%{sbinpath}/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
index bc98f59..93c2835 100644
--- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
+++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk-proxy
@@ -31,8 +32,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: spacewalk-proxy-management
Requires: spacewalk-proxy-common
Requires: spacewalk-proxy-broker
@@ -86,7 +87,7 @@ fi
%posttrans
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+ %{sbinpath}/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
fi
%postun
@@ -99,7 +100,7 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+%{sbinpath}/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index a71f0a8..a731c11 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk
@@ -29,8 +30,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/semanage, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/semanage, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/semanage
Requires: spacewalk-config
Requires: spacewalk-admin
Requires: spacewalk-backend
@@ -88,7 +89,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
+ %{sbinpath}/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
/usr/bin/rhn-sudo-ssl-tool /usr/sbin/tanukiwrapper
fi
@@ -102,7 +103,7 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl %{_sbindir}/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
+%{sbinpath}/restorecon -rvvi /usr/share/rhn/satidmap.pl %{_sbindir}/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
%{_bindir}/rhn-sudo-ssl-tool /usr/sbin/tanukiwrapper
%files
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 796ab1e..1fd37c6 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-setup
Version: 1.10.2
Release: 1%{?dist}
@@ -19,7 +21,7 @@ BuildArch: noarch
Requires: perl
Requires: perl-Params-Validate
Requires: spacewalk-schema
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
Requires: spacewalk-admin
Requires: spacewalk-certs-tools
Requires: perl-Satcon
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 49c489f..d5914a3 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
@@ -71,11 +73,7 @@ Requires: httpd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Obsoletes: rhn-dobby < 5.3.0
Provides: rhn-dobby = 5.3.0
-%if 0%{?fedora} > 17
-Requires: %{_sbindir}/runuser
-%else
-Requires: /sbin/runuser
-%endif
+Requires: %{sbinpath}/runuser
%description -n spacewalk-dobby
Dobby is collection of Perl modules and scripts to administer an Oracle
11 years, 3 months
3 commits - client/tools monitoring/nocpulse-common monitoring/rhnmd projects/oracle-server-scripts projects/perl-Satcon rel-eng/packages schema/spacewalk selinux/jabberd-selinux selinux/oracle-instantclient-selinux selinux/oracle-rhnsat-selinux selinux/oracle-selinux selinux/oracle-xe-selinux selinux/spacewalk-monitoring-selinux selinux/spacewalk-proxy-selinux selinux/spacewalk-selinux spacewalk/setup web/spacewalk-web.spec
by Michael Mraka
client/tools/osad/osad.spec | 11 ++-
monitoring/nocpulse-common/nocpulse-common.spec | 15 ++--
monitoring/rhnmd/rhnmd.spec | 5 -
projects/oracle-server-scripts/oracle-server-scripts.spec | 13 +--
projects/perl-Satcon/perl-Satcon.spec | 4 -
rel-eng/packages/nocpulse-common | 2
rel-eng/packages/osad | 2
schema/spacewalk/spacewalk-schema.spec | 4 -
selinux/jabberd-selinux/jabberd-selinux.spec | 9 +-
selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec | 21 +++---
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 14 ++--
selinux/oracle-selinux/oracle-selinux.spec | 33 +++++-----
selinux/oracle-xe-selinux/oracle-xe-selinux.spec | 13 ++-
selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec | 13 ++-
selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec | 9 +-
selinux/spacewalk-selinux/spacewalk-selinux.spec | 9 +-
spacewalk/setup/spacewalk-setup.spec | 4 -
web/spacewalk-web.spec | 8 --
18 files changed, 101 insertions(+), 88 deletions(-)
New commits:
commit 139f5423f4dc34eb098f9308c0f396446bb4305f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:43:43 2013 +0100
Automatic commit of package [nocpulse-common] release [2.2.7-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index 2645e3b..73b022d 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: nocpulse-common
-Version: 2.2.6
+Version: 2.2.7
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -152,6 +152,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.2.7-1
+- 919468 - fixed path in file based Requires
+
* Fri Mar 08 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.2.6-1
- Fedora 19 does not provide /sbin/runuser
- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index e90a6b5..6de9bdf 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.2.6-1 monitoring/nocpulse-common/
+2.2.7-1 monitoring/nocpulse-common/
commit 59e843b7303e6b86d32d2691ee26edd76dc76f34
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:43:09 2013 +0100
Automatic commit of package [osad] release [5.11.19-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 2254283..4c30459 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -17,7 +17,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.18
+Version: 5.11.19
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -351,6 +351,10 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Mar 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.11.19-1
+- 919468 - fixed path in file based Requires
+- Purging %%changelog entries preceding Spacewalk 1.0, in active packages.
+
* Thu Feb 28 2013 Jan Pazdziora 5.11.18-1
- Removing the dsn parameter from initDB, removing support for --db option.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index bcff96d..78a61a1 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.18-1 client/tools/osad/
+5.11.19-1 client/tools/osad/
commit 20460363e95e901897c313088d40020bbde2e5a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 22 16:39:03 2013 +0100
919468 - fixed path in file based Requires
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 9a85be6..2254283 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -1,6 +1,7 @@
%global rhnroot /usr/share/rhn
%global rhnconf /etc/sysconfig/rhn
%global client_caps_dir /etc/sysconfig/rhn/clientCaps.d
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%if 0%{?suse_version}
%global apache_group www
@@ -115,8 +116,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-114
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled, /usr/sbin/semanage
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage, spacewalk-selinux
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled, /usr/sbin/semanage
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/semanage, spacewalk-selinux
Requires: osa-dispatcher
%description -n osa-dispatcher-selinux
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec b/monitoring/nocpulse-common/nocpulse-common.spec
index c4371c5..2645e3b 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: nocpulse-common
Version: 2.2.6
Release: 1%{?dist}
@@ -10,11 +12,7 @@ Group: Applications/System
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): httpd, /usr/sbin/useradd
Requires(post): openssh
-%if 0%{?fedora} > 17
-Requires(post): %{_sbindir}/runuser
-%else
-Requires(post): /sbin/runuser
-%endif
+Requires(post): %{sbinpath}/runuser
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# merging this two packages together
# not backward compatible => no Provides:
@@ -132,7 +130,7 @@ fi
if [ ! -f %{identity} ]
then
- /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
+ %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{package_name}
fi
%files
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 749d751..f97c9a3 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -1,5 +1,6 @@
%global np_name nocpulse
%global identity %{_var}/lib/%{np_name}/.ssh/nocpulse-identity
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%if 0%{!?_initddir:1}
%global _initddir %{_sysconfdir}/rc.d/init.d
%endif
@@ -46,7 +47,7 @@ Obsoletes: rhnmd.x86_64 < 5.3.0-5
Provides: rhnmd.i386 = %{version}
Provides: rhnmd.x86_64 = %{version}
-Requires(post): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon
Requires(preun): /usr/sbin/semanage
%description
@@ -123,7 +124,7 @@ fi
%if !0%{?suse_version}
if [ ! -f %{identity} ]
then
- /sbin/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
+ %{sbinpath}/runuser -s /bin/bash -c "/usr/bin/ssh-keygen -q -t dsa -N '' -f %{identity}" - %{np_name}
fi
%endif
%if 0%{?suse_version} >= 1210
diff --git a/projects/oracle-server-scripts/oracle-server-scripts.spec b/projects/oracle-server-scripts/oracle-server-scripts.spec
index fb109e9..75b2a01 100644
--- a/projects/oracle-server-scripts/oracle-server-scripts.spec
+++ b/projects/oracle-server-scripts/oracle-server-scripts.spec
@@ -4,7 +4,7 @@
%define oracle_admin %{oracle_base}/admin/%{oracle_base_version}
%define oracle_config %{oracle_base}/config/%{oracle_base_version}
%define oracle_scripts %{oracle_base}/scripts/%{oracle_base_version}
-
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Summary: Oracle 10g Database Server Enterprise Edition scripts
Name: oracle-server-scripts
@@ -18,13 +18,8 @@ Buildroot: /var/tmp/%{name}-root
Requires: oracle-server >= %{oracle_base_version}
Requires: m4
Requires: oracle-config
-%if 0%{?fedora} > 17
-Requires(post): %{_sbindir}/runuser
-Requires: %{_sbindir}/restorecon
-%else
-Requires(post): /sbin/runuser
-Requires: /sbin/restorecon
-%endif
+Requires(post): %{sbinpath}/runuser
+Requires: %{sbinpath}/restorecon
%description
Management scripts for Oracle
@@ -73,7 +68,7 @@ fi
# setup environment for oracle user
[ -f %{oracle_base}/.bash_profile ] \
&& chown oracle.dba %{oracle_base}/.bash_profile
-/sbin/runuser - oracle -c 'cat - >>.bash_profile' <<EOP
+%{sbinpath}/runuser - oracle -c 'cat - >>.bash_profile' <<EOP
# entries added by the %{name} install script
# setup environment for embedded db
diff --git a/projects/perl-Satcon/perl-Satcon.spec b/projects/perl-Satcon/perl-Satcon.spec
index 5b541ad..8b602eb 100644
--- a/projects/perl-Satcon/perl-Satcon.spec
+++ b/projects/perl-Satcon/perl-Satcon.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: perl-Satcon
Summary: Framework for configuration files
Version: 1.19
@@ -10,7 +12,7 @@ BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRequires: perl(ExtUtils::MakeMaker)
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
%description
Framework for generating config files during installation.
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 71589c3..775576c 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
@@ -14,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(Digest::SHA)
BuildRequires: python
BuildRequires: /usr/bin/pod2man
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
Obsoletes: rhn-satellite-schema <= 5.1.0
diff --git a/selinux/jabberd-selinux/jabberd-selinux.spec b/selinux/jabberd-selinux/jabberd-selinux.spec
index 00b9e4d..3601aee 100644
--- a/selinux/jabberd-selinux/jabberd-selinux.spec
+++ b/selinux/jabberd-selinux/jabberd-selinux.spec
@@ -1,6 +1,7 @@
%global selinux_variants mls strict targeted
%global selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%global POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%global moduletype apps
%global modulename jabber
@@ -26,8 +27,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-114
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: jabberd >= 2.2.8
%description
@@ -80,7 +81,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
+ rpm -ql jabberd | xargs -n 1 %{sbinpath}/restorecon -ri {} || :
fi
%postun
@@ -95,7 +96,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage port -d -t jabber_interserver_port_t -p tcp 5347 || :
fi
-rpm -ql jabberd | xargs -n 1 /sbin/restorecon -ri {} || :
+rpm -ql jabberd | xargs -n 1 %{sbinpath}/restorecon -ri {} || :
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
index 90cf212..82e329a 100644
--- a/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
+++ b/selinux/oracle-instantclient-selinux/oracle-instantclient-selinux.spec
@@ -1,3 +1,4 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: oracle-instantclient-selinux
Version: 11.2.0.1
@@ -14,8 +15,8 @@ URL: http://fedorahosted.org/spacewalk
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, %{sbinpath}/restorecon
Requires: oracle-instantclient11.2-basic
Requires: oracle-nofcontext-selinux
@@ -27,8 +28,8 @@ Summary: SELinux support for Oracle Instant Client sqlplus
Group: System Environment/Base
Requires: oracle-instantclient11.2-sqlplus
Requires: oracle-nofcontext-selinux
-Requires(post): /usr/sbin/semanage, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, %{sbinpath}/restorecon
%description -n oracle-instantclient-sqlplus-selinux
SELinux support for Oracle Instant Client sqlplus.
@@ -50,7 +51,7 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/%{name}-enable
for i in %used_libs ; do
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/'${i//./\\.}
done
-/sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+%{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
EOS
@@ -60,7 +61,7 @@ cat <<'EOS' > %{buildroot}%{_sbindir}/oracle-instantclient-sqlplus-selinux-enabl
/usr/sbin/semanage fcontext -a -t oracle_sqlplus_exec_t '/usr/lib/oracle/11\.2/client.*/bin/sqlplus'
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplus\.so'
/usr/sbin/semanage fcontext -a -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplusic\.so'
-/sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+%{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
EOS
@@ -75,7 +76,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%postun
@@ -83,7 +84,7 @@ if [ $1 -eq 0 ]; then
for i in %used_libs ; do
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/'${i//./\\.}
done
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%post -n oracle-instantclient-sqlplus-selinux
@@ -94,7 +95,7 @@ fi
%posttrans -n oracle-instantclient-sqlplus-selinux
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%postun -n oracle-instantclient-sqlplus-selinux
@@ -102,7 +103,7 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage fcontext -d -t oracle_sqlplus_exec_t '/usr/lib/oracle/11\.2/client.*/bin/sqlplus'
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplus\.so'
/usr/sbin/semanage fcontext -d -t textrel_shlib_t '/usr/lib/oracle/11\.2/client.*/lib/libsqlplusic\.so'
- /sbin/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
+ %{sbinpath}/restorecon -Rvv /usr/lib/oracle/11.2/client* || :
fi
%files
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 7b4bce5..a35d91e 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -1,4 +1,4 @@
-
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define moduletype apps
@@ -21,8 +21,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: oracle-server >= 10.2.0.3
Requires: oracle-nofcontext-selinux
@@ -77,9 +77,9 @@ fi
#this may be safely removed when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Fix up oracle-server-arch files
- rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin/restorecon -Riv
+ rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 %{sbinpath}/restorecon -Riv
# Fix up database files
- /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || :
+ %{sbinpath}/restorecon -rvi /rhnsat /var/tmp/.oracle || :
fi
%postun
@@ -93,10 +93,10 @@ if [ $1 -eq 0 ]; then
done
# Clean up oracle-server-arch files
- rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 /sbin/restorecon -Riv
+ rpm -q --whatprovides oracle-server | xargs rpm -ql | xargs -n 100 %{sbinpath}/restorecon -Riv
# Clean up any remaining file contexts (shouldn't be any really)
- /sbin/restorecon -rvi /rhnsat /var/tmp/.oracle || :
+ %{sbinpath}/restorecon -rvi /rhnsat /var/tmp/.oracle || :
fi
%files
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 038da9e..dbcd486 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -9,6 +9,7 @@
%define modulename oracle
%define moduletype apps
%define default_oracle_base /opt/oracle
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
#
# tag to be used in release to differentiate rpms with the same policy but
@@ -33,8 +34,8 @@ BuildArch: noarch
%if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
-Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
+Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
Obsoletes: oracle-10gR2-selinux
%description
@@ -49,8 +50,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy-base >= 2.4.6-267
%endif
-Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semanage, /usr/sbin/semodule, %{sbinpath}/restorecon
Conflicts: oracle-selinux
%description -n oracle-nofcontext-selinux
@@ -128,19 +129,19 @@ SEPORT_STATUS=`semanage port -l | grep -c ^oracle`
test ${SEPORT_STATUS} -lt 1 && semanage port -a -t oracle_port_t -p tcp 1521 || :
# Fix up non-standard file contexts
-/sbin/restorecon -R -v %{oracle_base} || :
-/sbin/restorecon -R -v /u0? || :
-/sbin/restorecon -R -v /etc || :
-/sbin/restorecon -R -v /var/tmp || :
+%{sbinpath}/restorecon -R -v %{oracle_base} || :
+%{sbinpath}/restorecon -R -v /u0? || :
+%{sbinpath}/restorecon -R -v /etc || :
+%{sbinpath}/restorecon -R -v /var/tmp || :
%posttrans
#this may be safely removed when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Fix up non-standard file contexts
- /sbin/restorecon -R -v %{oracle_base} || :
- /sbin/restorecon -R -v /u0? || :
- /sbin/restorecon -R -v /etc || :
- /sbin/restorecon -R -v /var/tmp || :
+ %{sbinpath}/restorecon -R -v %{oracle_base} || :
+ %{sbinpath}/restorecon -R -v /u0? || :
+ %{sbinpath}/restorecon -R -v /etc || :
+ %{sbinpath}/restorecon -R -v /var/tmp || :
fi
%post -n oracle-nofcontext-selinux
@@ -172,10 +173,10 @@ if [ $1 -eq 0 ]; then
done
# Clean up any remaining file contexts (shouldn't be any really)
[ -d %{oracle_base} ] && \
- /sbin/restorecon -R -v %{oracle_base} &> /dev/null || :
- /sbin/restorecon -R -v /u0? || :
- /sbin/restorecon -R -v /etc || :
- /sbin/restorecon -R -v /var/tmp || :
+ %{sbinpath}/restorecon -R -v %{oracle_base} &> /dev/null || :
+ %{sbinpath}/restorecon -R -v /u0? || :
+ %{sbinpath}/restorecon -R -v /etc || :
+ %{sbinpath}/restorecon -R -v /var/tmp || :
fi
%postun -n oracle-nofcontext-selinux
diff --git a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
index b5a32e0..870fdb6 100644
--- a/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
+++ b/selinux/oracle-xe-selinux/oracle-xe-selinux.spec
@@ -3,6 +3,7 @@
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define moduletype apps
%define modulename oracle-xe
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: oracle-xe-selinux
Version: 10.2.0.33
@@ -24,8 +25,8 @@ BuildArch: noarch
%if "%{selinux_policyver}" != ""
Requires: selinux-policy >= %{selinux_policyver}
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/ldconfig, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, %{sbinpath}/ldconfig, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: /etc/init.d/oracle-xe
Requires: oracle-nofcontext-selinux
Requires: oracle-lib-compat
@@ -105,9 +106,9 @@ fi
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
# Relabel oracle-xe-univ/oracle-xe's files
- rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 %{sbinpath}/restorecon -Rivv
# Fix up additional directories, not owned by oracle-xe-univ/oracle-xe
- /sbin/restorecon -Rivv %extra_restorecon
+ %{sbinpath}/restorecon -Rivv %extra_restorecon
fi
%postun
@@ -124,10 +125,10 @@ if [ $1 -eq 0 ]; then
/usr/sbin/semanage port -d -t oracle_port_t -p tcp 9055 || :
# Clean up oracle-xe-univ/oracle-xe's files
- rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 /sbin/restorecon -Rivv
+ rpm -qlf /etc/init.d/oracle-xe | while read i ; do [ -e $i ] && echo $i ; done | xargs -n 100 %{sbinpath}/restorecon -Rivv
# Clean up additional directories, not owned by oracle-xe-univ/oracle-xe
- /sbin/restorecon -Rivv %extra_restorecon
+ %{sbinpath}/restorecon -Rivv %extra_restorecon
fi
%files
diff --git a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
index 6b8e240..63badf4 100644
--- a/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
+++ b/selinux/spacewalk-monitoring-selinux/spacewalk-monitoring-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk-monitoring
@@ -31,8 +32,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: nocpulse-common
Requires: nocpulse-db-perl
Requires: eventReceivers
@@ -117,8 +118,8 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
- /sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
+ %{sbinpath}/restorecon -rv /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
+ %{sbinpath}/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
fi
%postun
@@ -131,8 +132,8 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvi /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
-/sbin/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
+%{sbinpath}/restorecon -rvi /etc/rc.d/np.d /etc/notification /var/lib/nocpulse /var/lib/notification /var/log/nocpulse
+%{sbinpath}/restorecon -rvi /var/log/SysVStep.* /var/run/SysVStep.*
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
index bc98f59..93c2835 100644
--- a/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
+++ b/selinux/spacewalk-proxy-selinux/spacewalk-proxy-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk-proxy
@@ -31,8 +32,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon
Requires: spacewalk-proxy-management
Requires: spacewalk-proxy-common
Requires: spacewalk-proxy-broker
@@ -86,7 +87,7 @@ fi
%posttrans
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+ %{sbinpath}/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
fi
%postun
@@ -99,7 +100,7 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
+%{sbinpath}/restorecon -rvvi /var/log/rhn /var/cache/rhn/proxy-auth /var/spool/rhn-proxy
%files
%doc %{modulename}.fc %{modulename}.if %{modulename}.te
diff --git a/selinux/spacewalk-selinux/spacewalk-selinux.spec b/selinux/spacewalk-selinux/spacewalk-selinux.spec
index a71f0a8..a731c11 100644
--- a/selinux/spacewalk-selinux/spacewalk-selinux.spec
+++ b/selinux/spacewalk-selinux/spacewalk-selinux.spec
@@ -2,6 +2,7 @@
%define selinux_variants mls strict targeted
%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2> /dev/null)
%define POLICYCOREUTILSVER 1.33.12-1
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
%define moduletype apps
%define modulename spacewalk
@@ -29,8 +30,8 @@ Requires: selinux-policy >= %{selinux_policyver}
%if 0%{?rhel} == 5
Requires: selinux-policy >= 2.4.6-80
%endif
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/setsebool, /usr/sbin/semanage, /usr/sbin/selinuxenabled
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /usr/sbin/semanage
+Requires(post): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/setsebool, /usr/sbin/semanage, /usr/sbin/selinuxenabled
+Requires(postun): /usr/sbin/semodule, %{sbinpath}/restorecon, /usr/sbin/semanage
Requires: spacewalk-config
Requires: spacewalk-admin
Requires: spacewalk-backend
@@ -88,7 +89,7 @@ fi
%posttrans
#this may be safely remove when BZ 505066 is fixed
if /usr/sbin/selinuxenabled ; then
- /sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
+ %{sbinpath}/restorecon -rvvi /usr/share/rhn/satidmap.pl /usr/sbin/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
/usr/bin/rhn-sudo-ssl-tool /usr/sbin/tanukiwrapper
fi
@@ -102,7 +103,7 @@ if [ $1 -eq 0 ]; then
done
fi
-/sbin/restorecon -rvvi /usr/share/rhn/satidmap.pl %{_sbindir}/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
+%{sbinpath}/restorecon -rvvi /usr/share/rhn/satidmap.pl %{_sbindir}/rhn-sat-restart-silent /var/log/rhn /var/cache/rhn \
%{_bindir}/rhn-sudo-ssl-tool /usr/sbin/tanukiwrapper
%files
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 796ab1e..1fd37c6 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-setup
Version: 1.10.2
Release: 1%{?dist}
@@ -19,7 +21,7 @@ BuildArch: noarch
Requires: perl
Requires: perl-Params-Validate
Requires: spacewalk-schema
-Requires: /sbin/restorecon
+Requires: %{sbinpath}/restorecon
Requires: spacewalk-admin
Requires: spacewalk-certs-tools
Requires: perl-Satcon
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 49c489f..d5914a3 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -1,3 +1,5 @@
+%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
+
Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
@@ -71,11 +73,7 @@ Requires: httpd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Obsoletes: rhn-dobby < 5.3.0
Provides: rhn-dobby = 5.3.0
-%if 0%{?fedora} > 17
-Requires: %{_sbindir}/runuser
-%else
-Requires: /sbin/runuser
-%endif
+Requires: %{sbinpath}/runuser
%description -n spacewalk-dobby
Dobby is collection of Perl modules and scripts to administer an Oracle
11 years, 3 months
Changes to 'refs/tags/spacewalk-branding-1.10.10-1'
by Michael Mraka
Tag 'spacewalk-branding-1.10.10-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 14:11 +0000
Tagging package [spacewalk-branding] version [1.10.10-1] in directory [branding/].
Changes since spacewalk-setup-1.10.2-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-branding] release [1.10.10-1].
---
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 3 months
Changes to 'refs/tags/spacewalk-setup-1.10.2-1'
by Michael Mraka
Tag 'spacewalk-setup-1.10.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-03-22 14:10 +0000
Tagging package [spacewalk-setup] version [1.10.2-1] in directory [spacewalk/setup/].
Changes since spacewalk-schema-1.10.14-1:
Michael Mraka (3):
simplify tomcat version decisison
supress systemd messages during setup
Automatic commit of package [spacewalk-setup] release [1.10.2-1].
---
branding/spacewalk-branding.spec | 40 +++++++++++------------------------
rel-eng/packages/spacewalk-setup | 2 -
spacewalk/setup/bin/spacewalk-setup | 2 -
spacewalk/setup/spacewalk-setup.spec | 7 +++++-
4 files changed, 21 insertions(+), 30 deletions(-)
---
11 years, 3 months