Compare commits

...

5 Commits
master ... f23

Author SHA1 Message Date
Petr Lautrbach 1618c3deca libselinux-2.4-5.fc23
- Use fully versioned arch-specific requires

https://fedoraproject.org/wiki/Packaging:Guidelines#Requiring_Base_Package
2016-02-28 11:38:08 +01:00
Petr Lautrbach c656a64759 make-rhat-patches.sh: use fedora-selinux/selinux.git f23 branch 2015-11-20 12:44:14 +01:00
Petr Lautrbach 3b1d4f2767 Merge remote-tracking branch 'origin/master' into f23 2015-09-30 17:09:55 +02:00
Petr Lautrbach 0f0cabfb06 Merge remote-tracking branch 'origin/master' into f23 2015-09-02 14:54:19 +02:00
Petr Lautrbach d69e17b675 We need to conflict with selinux-policy-base
Conflict with selinux-policy causes deadlocks in buildroots when
there's no selinux-policy available. selinux-policy-base is provided by
targeted, mls and minimum subpackages which are not installed to
buildroots.
2015-07-21 14:06:57 +02:00
2 changed files with 13 additions and 10 deletions

View File

@ -9,7 +9,7 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 2.4
Release: 4%{?dist}
Release: 5%{?dist}
License: Public Domain
Group: System Environment/Libraries
# https://github.com/SELinuxProject/selinux/wiki/Releases
@ -24,7 +24,7 @@ BuildRequires: pkgconfig python-devel ruby-devel ruby libsepol-static >= %{libse
%if 0%{?with_python3}
BuildRequires: python3-devel
%endif # if with_python3
Requires: libsepol >= %{libsepolver} pcre
Requires: libsepol%{?_isa} >= %{libsepolver} pcre
Conflicts: filesystem < 3, selinux-policy-base < 3.13.1-138
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -46,7 +46,7 @@ decisions. Required for any applications that use the SELinux API.
%package utils
Summary: SELinux libselinux utilies
Group: Development/Libraries
Requires: libselinux = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
The libselinux-utils package contains the utilities
@ -54,7 +54,7 @@ The libselinux-utils package contains the utilities
%package python
Summary: SELinux python bindings for libselinux
Group: Development/Libraries
Requires: libselinux = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description python
The libselinux-python package contains the python bindings for developing
@ -64,7 +64,7 @@ SELinux applications.
%package python3
Summary: SELinux python 3 bindings for libselinux
Group: Development/Libraries
Requires: libselinux = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description python3
The libselinux-python3 package contains python 3 bindings for developing
@ -74,7 +74,7 @@ SELinux applications.
%package ruby
Summary: SELinux ruby bindings for libselinux
Group: Development/Libraries
Requires: libselinux = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: ruby(selinux)
%description ruby
@ -84,8 +84,8 @@ SELinux applications.
%package devel
Summary: Header files and libraries used to build SELinux
Group: Development/Libraries
Requires: libselinux = %{version}-%{release}
Requires: libsepol-devel >= %{libsepolver}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libsepol-devel%{?_isa} >= %{libsepolver}
%description devel
The libselinux-devel package contains the libraries and header files
@ -94,7 +94,7 @@ needed for developing SELinux applications.
%package static
Summary: Static libraries used to build SELinux
Group: Development/Libraries
Requires: libselinux-devel = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description static
The libselinux-static package contains the static libraries
@ -247,6 +247,9 @@ rm -rf %{buildroot}
%{ruby_vendorarchdir}/selinux.so
%changelog
* Sun Feb 28 2016 Petr Lautrbach <plautrba@redhat.com> 2.4-5
- Use fully versioned arch-specific requires
* Wed Sep 30 2015 Petr Lautrbach <plautrba@redhat.com> 2.4-4
- Flush the class/perm string mapping cache on policy reload (#1264051)
- Fix restorecon when path has no context

View File

@ -1,7 +1,7 @@
#!/bin/bash
LIBSELINUX_VERSION=2.4
BRANCH=master
BRANCH=f23
REBASEDIR=`mktemp -d rebase.XXXXXX`
pushd $REBASEDIR