Browse code
Update package libselinux & libgudev
Change-Id: I804627867b2fe555c9d1726d64bcb3bcd86fbf38
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2520
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
harishspqr authored on 2017/04/26 03:01:50Showing 3 changed files
| ... | ... |
@@ -36,17 +36,18 @@ libgudev-devel package contains header files for building gudev applications. |
| 36 | 36 |
%setup -q |
| 37 | 37 |
|
| 38 | 38 |
%build |
| 39 |
-./configure \ |
|
| 40 |
- --prefix=%{_prefix} \
|
|
| 41 |
- --disable-umockdev |
|
| 39 |
+./configure --prefix=/usr --disable-umockdev && |
|
| 42 | 40 |
make %{?_smp_mflags}
|
| 43 | 41 |
|
| 44 | 42 |
%install |
| 45 | 43 |
make DESTDIR=%{buildroot} install
|
| 46 | 44 |
|
| 47 |
-%post -p /sbin/ldconfig |
|
| 45 |
+%check |
|
| 46 |
+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
|
| 48 | 47 |
|
| 49 |
-%postun -p /sbin/ldconfig |
|
| 48 |
+%post -p /sbin/ldconfig |
|
| 49 |
+ |
|
| 50 |
+%postun -p /sbin/ldconfig |
|
| 50 | 51 |
|
| 51 | 52 |
%files |
| 52 | 53 |
%defattr(-,root,root) |
| ... | ... |
@@ -67,13 +68,13 @@ make DESTDIR=%{buildroot} install
|
| 67 | 67 |
|
| 68 | 68 |
%changelog |
| 69 | 69 |
* Mon Apr 10 2017 Harish Udaiya kumar <hudaiyakumar@vmware.com> 231-1 |
| 70 |
-- Updated to version 231-1. |
|
| 71 |
-* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 230-4 |
|
| 72 |
-- Change systemd dependency |
|
| 73 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 230-3 |
|
| 74 |
-- GA - Bump release of all rpms |
|
| 75 |
-* Thu Aug 13 2015 Vinay Kulkarni <kulkarniv@vmware.com> 230-2 |
|
| 76 |
-- Split header files into devel package. |
|
| 77 |
-* Tue Aug 11 2015 Vinay Kulkarni <kulkarniv@vmware.com> 230-1 |
|
| 78 |
-- Add libgudev v230 |
|
| 70 |
+- Updated to version 231. |
|
| 71 |
+* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 230-4 |
|
| 72 |
+- Change systemd dependency |
|
| 73 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 230-3 |
|
| 74 |
+- GA - Bump release of all rpms |
|
| 75 |
+* Thu Aug 13 2015 Vinay Kulkarni <kulkarniv@vmware.com> 230-2 |
|
| 76 |
+- Split header files into devel package. |
|
| 77 |
+* Tue Aug 11 2015 Vinay Kulkarni <kulkarniv@vmware.com> 230-1 |
|
| 78 |
+- Add libgudev v230 |
|
| 79 | 79 |
|
| ... | ... |
@@ -1,18 +1,18 @@ |
| 1 | 1 |
Summary: SELinux library and simple utilities |
| 2 | 2 |
Name: libselinux |
| 3 |
-Version: 2.5 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 3 |
+Version: 2.6 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: Public Domain |
| 6 | 6 |
Group: System Environment/Libraries |
| 7 |
-Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/%{name}-%{version}-rc1.tar.gz
|
|
| 8 |
-%define sha1 libselinux=ca50f64f5996c6c4c80a9f80a9adf038231ba211 |
|
| 7 |
+Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/%{name}-%{version}.tar.gz
|
|
| 8 |
+%define sha1 libselinux=38213c5f3298c980a399ea73e47498e7a393e4f7 |
|
| 9 | 9 |
Url: https://github.com/SELinuxProject/selinux/wiki |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
BuildRequires: libsepol-devel |
| 13 | 13 |
BuildRequires: pcre-devel, swig |
| 14 |
-BuildRequires: python2-devel, python2-libs |
|
| 15 | 14 |
Requires: pcre-libs |
| 15 |
+Requires: libsepol |
|
| 16 | 16 |
|
| 17 | 17 |
%description |
| 18 | 18 |
Security-enhanced Linux is a feature of the Linux® kernel and a number |
| ... | ... |
@@ -37,17 +37,6 @@ Requires: libselinux = %{version}-%{release}
|
| 37 | 37 |
%description utils |
| 38 | 38 |
The libselinux-utils package contains the utilities |
| 39 | 39 |
|
| 40 |
-%package python |
|
| 41 |
-Summary: SELinux python bindings for libselinux |
|
| 42 |
-Group: Development/Libraries |
|
| 43 |
-Requires: libselinux = %{version}-%{release}
|
|
| 44 |
-Requires: python2 |
|
| 45 |
-Requires: python2-libs |
|
| 46 |
- |
|
| 47 |
-%description python |
|
| 48 |
-The libselinux-python package contains the python bindings for developing |
|
| 49 |
-SELinux applications. |
|
| 50 |
- |
|
| 51 | 40 |
%package devel |
| 52 | 41 |
Summary: Header files and libraries used to build SELinux |
| 53 | 42 |
Group: Development/Libraries |
| ... | ... |
@@ -61,21 +50,19 @@ The libselinux-devel package contains the libraries and header files |
| 61 | 61 |
needed for developing SELinux applications. |
| 62 | 62 |
|
| 63 | 63 |
%prep |
| 64 |
-%setup -qn %{name}-%{version}-rc1
|
|
| 64 |
+%setup -qn %{name}-%{version}
|
|
| 65 | 65 |
|
| 66 | 66 |
%build |
| 67 | 67 |
|
| 68 |
-make clean |
|
| 69 |
-make LIBDIR="%{_libdir}" %{?_smp_mflags} swigify
|
|
| 70 |
-make LIBDIR="%{_libdir}" %{?_smp_mflags} all
|
|
| 71 |
-make LIBDIR="%{_libdir}" %{?_smp_mflags} pywrap
|
|
| 68 |
+make %{?_smp_mflags}
|
|
| 72 | 69 |
|
| 73 | 70 |
%install |
| 74 |
-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" install install-pywrap
|
|
| 71 |
+make DESTDIR=%{buildroot} install
|
|
| 75 | 72 |
|
| 76 | 73 |
mkdir -p %{buildroot}/%{_prefix}/lib/tmpfiles.d
|
| 77 | 74 |
mkdir -p %{buildroot}/var/run/setrans
|
| 78 | 75 |
echo "d /var/run/setrans 0755 root root" > %{buildroot}/%{_prefix}/lib/tmpfiles.d/libselinux.conf
|
| 76 |
+mv %{buildroot}/lib/libselinux.so.* %{buildroot}%{_libdir}/
|
|
| 79 | 77 |
|
| 80 | 78 |
%clean |
| 81 | 79 |
rm -rf %{buildroot}
|
| ... | ... |
@@ -86,9 +73,11 @@ rm -rf %{buildroot}
|
| 86 | 86 |
|
| 87 | 87 |
%files |
| 88 | 88 |
%defattr(-,root,root,-) |
| 89 |
-%{_lib}/libselinux.so.*
|
|
| 90 | 89 |
%ghost /var/run/setrans |
| 90 |
+%{_libdir}/*
|
|
| 91 | 91 |
%{_prefix}/lib/tmpfiles.d/libselinux.conf
|
| 92 |
+%exclude %{_libdir}/pkgconfig
|
|
| 93 |
+%exclude /usr/lib/debug |
|
| 92 | 94 |
|
| 93 | 95 |
%files utils |
| 94 | 96 |
%defattr(-,root,root,-) |
| ... | ... |
@@ -99,23 +88,20 @@ rm -rf %{buildroot}
|
| 99 | 99 |
%files devel |
| 100 | 100 |
%defattr(-,root,root,-) |
| 101 | 101 |
%{_libdir}/libselinux.so
|
| 102 |
-%{_libdir}/pkgconfig/libselinux.pc
|
|
| 102 |
+%{_libdir}/pkgconfig
|
|
| 103 | 103 |
%dir %{_includedir}/selinux
|
| 104 | 104 |
%{_includedir}/selinux/*
|
| 105 | 105 |
%{_libdir}/libselinux.a
|
| 106 | 106 |
%{_mandir}/man3/*
|
| 107 | 107 |
|
| 108 |
-%files python |
|
| 109 |
-%defattr(-,root,root,-) |
|
| 110 |
-%dir %{python_sitearch}/selinux
|
|
| 111 |
-%{python_sitearch}/selinux/*
|
|
| 112 |
- |
|
| 113 | 108 |
%changelog |
| 114 |
-* Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 2.5-3 |
|
| 115 |
-- Remove pcre requires and add requires on pcre-libs |
|
| 109 |
+* Wed May 03 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.6-1 |
|
| 110 |
+- Upgraded to version 2.6 |
|
| 111 |
+* Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 2.5-3 |
|
| 112 |
+- Remove pcre requires and add requires on pcre-libs |
|
| 116 | 113 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.5-2 |
| 117 | 114 |
- GA - Bump release of all rpms |
| 118 |
-* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 2.5-1 |
|
| 119 |
-- Updated to version 2.5 |
|
| 115 |
+* Fri Jan 22 2016 Xiaolin Li <xiaolinl@vmware.com> 2.5-1 |
|
| 116 |
+- Updated to version 2.5 |
|
| 120 | 117 |
* Wed Feb 25 2015 Divya Thaluru <dthaluru@vmware.com> 2.4-1 |
| 121 | 118 |
- Initial build. First version |