Accepting request 415258 from home:jengelh:branches:security:SELinux

resubmit because merge conflict ensued

- Update RPM groups, trim description and combine filelist entries.
Note that the *SRPM* group field is updated here,
which must not be System/Libraries. Or at least should not be,
because there is a much better group for selinux
(be it System/Base, or Security/lol or D/L/C)

OBS-URL: https://build.opensuse.org/request/show/415258
OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=88

libselinux-bindings.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 17 15:30:05 UTC 2016 - jengelh@inai.de
+
+- Update RPM groups, trim description and combine filelist entries.
+
 -------------------------------------------------------------------
 Thu Jul 14 07:59:04 UTC 2016 - jsegitz@novell.com
 

libselinux-bindings.spec

@@ -21,10 +21,10 @@
 Name:           libselinux-bindings
 Version:        2.5
 Release:        0
-Url:            http://userspace.selinuxproject.org/
+Summary:        SELinux runtime library and simple utilities
-Summary:        SELinux library and simple utilities
 License:        GPL-2.0 and SUSE-Public-Domain
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
+Url:            https://github.com/SELinuxProject/selinux/wiki/Releases
 
 # embedded is the MD5
 Source:         https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libselinux-%{version}.tar.gz
@@ -41,69 +41,36 @@ BuildRequires:  ruby-devel
 BuildRequires:  swig
 
 %description
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+libselinux provides an interface to get and set process and file
-number of utilities with enhanced security functionality designed to
+security contexts and to obtain security policy decisions.
-add mandatory access controls to Linux.  The Security-enhanced Linux
-kernel contains new architectural components originally developed to
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
-
 
 %package -n python-selinux
-Summary:        SELinux library and simple utilities
+Summary:        Python bindings for the SELinux runtime library
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/Python
 Requires:       libselinux1 = %{version}
 Requires:       python
 
 %description -n python-selinux
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+libselinux provides an interface to get and set process and file
-number of utilities with enhanced security functionality designed to
+security contexts and to obtain security policy decisions.
-add mandatory access controls to Linux.  The Security-enhanced Linux
-kernel contains new architectural components originally developed to
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
 
+This subpackage contains Python extensions to use SELinux from that
+language.
 
 %package -n ruby-selinux
-Summary:        SELinux library and simple utilities
+Summary:        Ruby bindings for the SELinux runtime library
 License:        SUSE-Public-Domain
 Group:          Development/Languages/Ruby
 Requires:       libselinux1 = %{version}
 Requires:       ruby
 
 %description -n ruby-selinux
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+libselinux provides an interface to get and set process and file
-number of utilities with enhanced security functionality designed to
+security contexts and to obtain security policy decisions.
-add mandatory access controls to Linux.  The Security-enhanced Linux
-kernel contains new architectural components originally developed to
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
 
+This subpackage contains Ruby extensions to use SELinux from that
+language.
 
 %prep
 %setup -q -n libselinux-%{version}
@@ -124,9 +91,8 @@ rm -rf $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT%{_libdir}/libselinux.* $RPM_BUILD
 
 %files -n python-selinux
 %defattr(-,root,root,-)
-%dir %{py_sitedir}/selinux
+%{py_sitedir}/selinux/
 %{py_sitedir}/_selinux.so
-%{py_sitedir}/selinux/*
 
 %files -n ruby-selinux
 %defattr(-,root,root,-)

libselinux.changes

@@ -13,6 +13,11 @@ Sun Jul 24 19:05:35 UTC 2016 - crrodriguez@opensuse.org
   filters must allow mount(2)
   (libselinux-proc-mount-only-if-needed.patch)
 
+-------------------------------------------------------------------
+Sun Jul 17 15:30:05 UTC 2016 - jengelh@inai.de
+
+- Update RPM groups, trim description and combine filelist entries.
+
 -------------------------------------------------------------------
 Thu Jul 14 07:58:49 UTC 2016 - jsegitz@novell.com
 

libselinux.spec

@@ -21,10 +21,10 @@
 Name:           libselinux
 Version:        2.5
 Release:        0
-Url:            http://userspace.selinuxproject.org/
+Summary:        SELinux runtime library and utilities
-Summary:        SELinux library and simple utilities
 License:        GPL-2.0 and SUSE-Public-Domain
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
+Url:            https://github.com/SELinuxProject/selinux/wiki/Releases
 
 Source:         https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/%{name}-%{version}.tar.gz
 Source1:        selinux-ready
@@ -41,88 +41,63 @@ BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 
 %description
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+libselinux provides an interface to get and set process and file
-number of utilities with enhanced security functionality designed to
+security contexts and to obtain security policy decisions.
-add mandatory access controls to Linux.  The Security-enhanced Linux
-kernel contains new architectural components originally developed to
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
-
 
 %package -n libselinux1
-Summary:        SELinux library and simple utilities
+Summary:        SELinux runtime library
 Group:          System/Libraries
 
 %description -n libselinux1
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+libselinux provides an interface to get and set process and file
-number of utilities with enhanced security functionality designed to
+security contexts and to obtain security policy decisions.
-add mandatory access controls to Linux.  The Security-enhanced Linux
-kernel contains new architectural components originally developed to
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
 
+(Security-enhanced Linux is a feature of the kernel and some
+utilities that implement mandatory access control policies, such as
+Type Enforcement, Role-based Access Control and Multi-Level
+Security.)
 
 %package -n selinux-tools
-Summary:        SELinux library and simple utilities
+Summary:        SELinux command-line utilities
 Group:          System/Base
 
 %description -n selinux-tools
-Security-enhanced Linux is a feature of the Linux(R) kernel and a
+Security-enhanced Linux is a feature of the kernel and some
-number of utilities with enhanced security functionality designed to
+utilities that implement mandatory access control policies, such as
-add mandatory access controls to Linux.  The Security-enhanced Linux
+Type Enforcement, Role-based Access Control and Multi-Level
-kernel contains new architectural components originally developed to
+Security.
-improve the security of the Flask operating system. These architectural
-components provide general support for the enforcement of many kinds of
-mandatory access control policies, including those based on the
-concepts of Type Enforcement(R), Role-based Access Control, and
-Multi-level Security.
-
-libselinux provides an API for SELinux applications to get and set
-process and file security contexts and to obtain security policy
-decisions.  Required for any applications that use the SELinux API.
-
 
+This subpackage contains utilities to inspect and administer the
+system's SELinux state.
 
 %package devel
-Summary:        Development Include Files and Libraries for SELinux
+Summary:        Development files for the SELinux runtime library
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libselinux1 = %{version}
 #Automatic dependency on libsepol-devel via pkgconfig
 
 %description devel
+libselinux provides an interface to get and set process and file
+security contexts and to obtain security policy decisions.
+
 This package contains the development files, which are
 necessary to develop your own software using libselinux.
 
-
 %package devel-static
-Summary:        Static development Include Files and Libraries for SELinux
+Summary:        Static archives for the SELinux runtime
 Group:          Development/Libraries/C and C++
 Requires:       libselinux-devel = %{version}
 Requires:       pkgconfig(libpcre)
 Requires:       pkgconfig(libsepol)
 
 %description devel-static
+libselinux provides an interface to get and set process and file
+security contexts and to obtain security policy decisions.
+
 This package contains the static development files, which are
 necessary to develop your own software using libselinux.
 
-
 %prep
 %setup -q
 %patch1
@@ -189,8 +164,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/selinux-ready
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libselinux.so
-%dir %{_includedir}/selinux
+%{_includedir}/selinux/
-%{_includedir}/selinux/*
 %{_mandir}/man3/*
 %{_libdir}/pkgconfig/libselinux.pc