rel-eng/packages/oracle-selinux | 2 -
selinux/oracle-selinux/Makefile | 4 --
selinux/oracle-selinux/build.py.props | 3 --
selinux/oracle-selinux/oracle-selinux.spec | 41 ++++++++++++-----------------
4 files changed, 18 insertions(+), 32 deletions(-)
New commits:
commit 8e9a07495fa30f835f82ac488ab375e6028b78d3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:34:43 2012 +0200
Automatic commit of package [oracle-selinux] release [0.1.23.33-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index c14ac99..96d5e47 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.32-1 selinux/oracle-selinux/
+0.1.23.33-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index 476edac..7ee899f 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -19,7 +19,7 @@
%endif
Name: oracle-selinux
-Version: 0.1.23.32
+Version: 0.1.23.33
Release: 1%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -209,6 +209,10 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Mon Jul 16 2012 Jan Pazdziora 0.1.23.33-1
+- Start using the .tar.gz in the .src.rpm for oracle-selinux.
+- %%defattr is not needed since rpm 4.4
+
* Wed Nov 23 2011 Jan Pazdziora 0.1.23.32-1
- Require the roles.
commit e70193574b1788d42e583807fabb357e956296b1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:25:37 2012 +0200
Start using the .tar.gz in the .src.rpm for oracle-selinux.
diff --git a/selinux/oracle-selinux/Makefile b/selinux/oracle-selinux/Makefile
deleted file mode 100644
index 6705603..0000000
--- a/selinux/oracle-selinux/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NO_TAR_GZ = 1
-
-include ../../rel-eng/Makefile
diff --git a/selinux/oracle-selinux/build.py.props
b/selinux/oracle-selinux/build.py.props
deleted file mode 100644
index 2222932..0000000
--- a/selinux/oracle-selinux/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/selinux/oracle-selinux/oracle-selinux.spec
b/selinux/oracle-selinux/oracle-selinux.spec
index 973e098..476edac 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -25,11 +25,7 @@ Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
License: GPLv2+
URL:
http://www.stl.gtri.gatech.edu/rmyers/oracle-selinux/
-Source1: %{modulename}.if
-Source2: %{modulename}.te
-Source3: %{modulename}.fc
-Source4: oracle-nofcontext-selinux-enable
-Source5: %{modulename}-port.te
+Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: checkpolicy, selinux-policy-devel, hardlink
BuildArch: noarch
@@ -62,21 +58,17 @@ SELinux policy module defining types and interfaces for
Oracle RDBMS, without specifying any file contexts.
%prep
-rm -rf SELinux
-mkdir -p SELinux
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
+%setup -q
-# Make file contexts relative to oracle_base
-perl -pi -e 's#%{default_oracle_base}#%{oracle_base}#g' SELinux/%{modulename}.fc
+%build
+perl -pi -e 's#%{default_oracle_base}#%{oracle_base}#g' %{modulename}.fc
# Create oracle-nofcontext source files
-cp SELinux/%{modulename}.if SELinux/%{modulename}-nofcontext.if
-cp SELinux/%{modulename}.te SELinux/%{modulename}-nofcontext.te
-sed -i 's!^policy_module(oracle,!policy_module(oracle-nofcontext,!'
SELinux/%{modulename}-nofcontext.te
+cp %{modulename}.if %{modulename}-nofcontext.if
+cp %{modulename}.te %{modulename}-nofcontext.te
+sed -i 's!^policy_module(oracle,!policy_module(oracle-nofcontext,!'
%{modulename}-nofcontext.te
-%build
# Build SELinux policy modules
-cd SELinux
for selinuxvariant in %{selinux_variants}
do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
@@ -85,13 +77,11 @@ do
mv %{modulename}-port.pp %{modulename}-port.pp.${selinuxvariant}
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
-cd -
%install
rm -rf %{buildroot}
# Install SELinux policy modules
-cd SELinux
for selinuxvariant in %{selinux_variants}
do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
@@ -102,13 +92,12 @@ for selinuxvariant in %{selinux_variants}
install -p -m 644 %{modulename}-port.pp.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}-port.pp
done
-cd -
# Install SELinux interfaces
install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 SELinux/%{modulename}.if \
+install -p -m 644 %{modulename}.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-install -p -m 644 SELinux/%{modulename}-nofcontext.if \
+install -p -m 644 %{modulename}-nofcontext.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}-nofcontext.if
# Hardlink identical policy module packages together
@@ -116,7 +105,7 @@ install -p -m 644 SELinux/%{modulename}-nofcontext.if \
# Install oracle-nofcontext-selinux-enable which will be called in %posttrans
install -d %{buildroot}%{_sbindir}
-install -p -m 755 SELinux/oracle-nofcontext-selinux-enable
%{buildroot}%{_sbindir}/oracle-nofcontext-selinux-enable
+install -p -m 755 oracle-nofcontext-selinux-enable
%{buildroot}%{_sbindir}/oracle-nofcontext-selinux-enable
%clean
rm -rf %{buildroot}
@@ -207,13 +196,13 @@ if [ $1 -eq 0 ]; then
fi
%files
-%doc SELinux/%{modulename}.fc SELinux/%{modulename}.if SELinux/%{modulename}.te
+%doc %{modulename}.fc %{modulename}.if %{modulename}.te
%{_datadir}/selinux/*/%{modulename}.pp
%{_datadir}/selinux/*/%{modulename}-port.pp
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
%files -n oracle-nofcontext-selinux
-%doc SELinux/%{modulename}-nofcontext.fc SELinux/%{modulename}-nofcontext.if
SELinux/%{modulename}-nofcontext.te
+%doc %{modulename}-nofcontext.fc %{modulename}-nofcontext.if %{modulename}-nofcontext.te
%{_datadir}/selinux/*/%{modulename}-nofcontext.pp
%{_datadir}/selinux/*/%{modulename}-port.pp
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}-nofcontext.if