Add back in the help png files

- Begin Adding support for file equivalency.
This commit is contained in:
Dan Walsh 2013-09-18 15:03:38 -04:00
parent 0a77d12b6f
commit 6879d63783
3 changed files with 690 additions and 389 deletions

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.1.14 Version: 2.1.14
Release: 80%{?dist} Release: 81%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# Based on git repository with tag 20101221 # Based on git repository with tag 20101221
@ -16,6 +16,7 @@ Source1:git://oss.tresys.com/git/selinux/sepolgen-%{sepolgenver}.tgz
URL: http://www.selinuxproject.org URL: http://www.selinuxproject.org
Source2: policycoreutils_man_ru2.tar.bz2 Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png Source3: system-config-selinux.png
Source4: sepolicy-help.tgz
Patch: policycoreutils-rhat.patch Patch: policycoreutils-rhat.patch
Patch1: policycoreutils-sepolgen.patch Patch1: policycoreutils-sepolgen.patch
Obsoletes: policycoreutils < 2.0.61-2 Obsoletes: policycoreutils < 2.0.61-2
@ -49,9 +50,10 @@ to switch roles.
%setup -q -a 1 %setup -q -a 1
%patch -p2 -b .rhat %patch -p2 -b .rhat
%patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver} %patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
cp %{SOURCE3} gui/
tar xvf %{SOURCE4}
%build %build
cp %{SOURCE3} gui/
make LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all make LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all
make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
@ -84,11 +86,16 @@ desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category Settings \ --add-category Settings \
%{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop %{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop
desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category Settings \
%{buildroot}%{_datadir}/system-config-selinux/sepolicy.desktop
desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
%{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
rm -f %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop rm -f %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
rm -f %{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop rm -f %{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop
rm -f %{buildroot}%{_datadir}/system-config-selinux/sepolicy.desktop
%find_lang %{name} %find_lang %{name}
@ -120,7 +127,7 @@ an SELinux environment.
%dir %{python_sitearch}/sepolicy %dir %{python_sitearch}/sepolicy
%{python_sitearch}/sepolicy/*so %{python_sitearch}/sepolicy/*so
%{python_sitearch}/sepolicy/templates %{python_sitearch}/sepolicy/templates
%{python_sitearch}/sepolicy/help %dir %{python_sitearch}/sepolicy/help
%{python_sitearch}/sepolicy/help/* %{python_sitearch}/sepolicy/help/*
%{python_sitearch}/sepolicy/__init__.py* %{python_sitearch}/sepolicy/__init__.py*
%{python_sitearch}/sepolicy/booleans.py* %{python_sitearch}/sepolicy/booleans.py*
@ -228,6 +235,7 @@ system-config-selinux is a utility for managing the SELinux environment
%files gui %files gui
%{_bindir}/system-config-selinux %{_bindir}/system-config-selinux
%{_bindir}/selinux-polgengui %{_bindir}/selinux-polgengui
%{_datadir}/applications/sepolicy.desktop
%{_datadir}/applications/system-config-selinux.desktop %{_datadir}/applications/system-config-selinux.desktop
%{_datadir}/applications/selinux-polgengui.desktop %{_datadir}/applications/selinux-polgengui.desktop
%{_datadir}/icons/hicolor/24x24/apps/system-config-selinux.png %{_datadir}/icons/hicolor/24x24/apps/system-config-selinux.png
@ -336,6 +344,10 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service %systemd_postun_with_restart restorecond.service
%changelog %changelog
* Wed Sep 18 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-81
- Add back in the help png files
- Begin Adding support for file equivalency.
* Wed Sep 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-80 * Wed Sep 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-80
- Random fixes for sepolicy gui - Random fixes for sepolicy gui
* Do not prompt for password until you make a change * Do not prompt for password until you make a change

BIN
sepolicy-help.tgz Normal file

Binary file not shown.