libselinux-2.5-0.1.rc1

Update to upstream rc1 release 2016-01-07

.gitignore

@@ -201,3 +201,4 @@ libselinux-2.0.96.tgz
 /libselinux-2.3.tgz
 /libselinux-2.3.tar.gz
 /libselinux-2.4.tar.gz
+/libselinux-2.5-rc1.tar.gz

libselinux.spec

@@ -3,25 +3,25 @@
 %endif
 
 %define ruby_inc %(pkg-config --cflags ruby)
-%define libsepolver 2.4-1
+%define libsepolver 2.5-0
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.4
-Release: 8%{?dist}
+Version: 2.5
+Release: 0.1.rc1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/%{name}-%{version}.tar.gz
+Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/libselinux-2.5-rc1.tar.gz
 Source1: selinuxconlist.8
 Source2: selinuxdefcon.8
 Url: https://github.com/SELinuxProject/selinux/wiki
-# use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/
-# HEAD https://github.com/fedora-selinux/selinux/commit/8c09d34e464e79a602fb9c9408554279aede3b6b
-Patch1: libselinux-rhat.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1284019
-Patch10: libselinux-rpm_execcon.patch
+# download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
+# run:
+# $ VERSION=2.5-rc1 ./make-fedora-selinux-patch.sh libselinux
+# HEAD https://github.com/fedora-selinux/selinux/commit/fcbe30acc1ab728944f06ee9df9dc007053b5781
+Patch1: libselinux-fedora.patch
 BuildRequires: pkgconfig python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -103,9 +103,8 @@ The libselinux-static package contains the static libraries
 needed for developing SELinux applications. 
 
 %prep
-%setup -q
-%patch1 -p1 -b .rhat
-%patch10 -p1 -b .rhat
+%setup -q -n libselinux-2.5-rc1
+%patch1 -p1 -b .fedora
 
 %build
 export LDFLAGS="%{?__global_ldflags}"
@@ -214,6 +213,11 @@ rm -rf %{buildroot}
 %{_sbindir}/selinuxexeccon
 %{_sbindir}/selinuxenabled
 %{_sbindir}/setenforce
+%{_sbindir}/selabel_digest
+%{_sbindir}/selabel_lookup
+%{_sbindir}/selabel_lookup_best_match
+%{_sbindir}/selabel_partial_match
+%{_sbindir}/selinux_restorecon
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
@@ -251,6 +255,9 @@ rm -rf %{buildroot}
 %{ruby_vendorarchdir}/selinux.so
 
 %changelog
+* Sun Feb 21 2016 Petr Lautrbach <plautrba@redhat.com> 2.5-0.1.rc1
+- Update to upstream rc1 release 2016-01-07
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

make-rhat-patches.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-LIBSELINUX_VERSION=2.4
-BRANCH=master
+LIBSELINUX_VERSION=2.5-rc1
+REPO=https://github.com/fedora-selinux/selinux
+BRANCH=master-rc
 
 REBASEDIR=`mktemp -d rebase.XXXXXX`
 pushd $REBASEDIR
 
-git clone https://github.com/fedora-selinux/selinux.git
+git clone $REPO
 pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd
 
 # prepare libselinux-rhat.patch
@@ -24,4 +25,4 @@ popd
 popd
 # echo rm -rf $REBASEDIR
 
-echo libselinux-rhat.patch created from https://github.com/fedora-selinux/selinux/commit/$COMMIT
+echo libselinux-rhat.patch created from $REPO/commit/$COMMIT

sources

@@ -1 +1 @@
-d19af2a367a81fb00bedc1b381694995  libselinux-2.4.tar.gz
+8cacc33d9b5ff7bd64a36302d88a9243  libselinux-2.5-rc1.tar.gz