[packages/selinux-python] - this is python3 now

baggins baggins at pld-linux.org
Sun Sep 22 11:24:16 CEST 2019 

commit eb4ac7d6d3d46e0b1003191477ddb38c92aae438
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 22 11:23:02 2019 +0200

    - this is python3 now

 selinux-python.spec | 115 +++++++++++++++-------------------------------------
 1 file changed, 33 insertions(+), 82 deletions(-)
---
diff --git a/selinux-python.spec b/selinux-python.spec
index 3443709..adcfed1 100644
--- a/selinux-python.spec
+++ b/selinux-python.spec
@@ -1,7 +1,3 @@
-#
-# Conditional build:
-%bcond_without	python3	# CPython 3.x modules
-#
 Summary:	SELinux Python policy utilities
 Summary(pl.UTF-8):	Narzędzia do polityk SELinuksa napisane w Pythonie
 Name:		selinux-python
@@ -14,11 +10,11 @@ Source0:	https://github.com/SELinuxProject/selinux/releases/download/20190315/%{
 # Source0-md5:	e9dfedd1139dd9998f5a09abfb670454
 URL:		https://github.com/SELinuxProject/selinux/wiki
 BuildRequires:	libsepol-static >= 2.7
-BuildRequires:	python-modules >= 1:2.7
+BuildRequires:	python3-modules
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 Requires:	policycoreutils >= 2.7
-Requires:	python-sepolicy = %{version}-%{release}
+Requires:	python3-sepolicy = %{version}-%{release}
 Obsoletes:	policycoreutils-sepolicy < 2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,43 +59,14 @@ Bash completion for semanage and sepolicy commands.
 %description -n bash-completion-%{name} -l pl.UTF-8
 Bashowe dopełnianie składni poleceń semanage i sepolicy.
 
-%package -n python-sepolgen
-Summary:	sepolgen - Python 2 module for policy generation
-Summary(pl.UTF-8):	Moduł Pythona 2 sepolgen do generowania polityki
-License:	GPL v2
-Group:		Python/Libraries
-Requires:	python-selinux >= 2.7
-Requires:	python-sepolgen-common = %{version}-%{release}
-Suggests:	python-setools
-BuildArch:	noarch
-
-%description -n python-sepolgen
-sepolgen - Python module for policy generation.
-
-%description -n python-sepolgen -l pl.UTF-8
-Moduł Pythona sepolgen do generowania polityki.
-
-%package -n python-sepolgen-common
-Summary:	Common files for sepolgen Python modules
-Summary(pl.UTF-8):	Pliki wspólne dla modułów Pythona sepolgen
-License:	GPL v2
-Group:		Development/Languages/Python
-
-%description -n python-sepolgen-common
-Common files for sepolgen Python modules.
-
-%description -n python-sepolgen-common -l pl.UTF-8
-Pliki wspólne dla modułów Pythona sepolgen.
-
 %package -n python3-sepolgen
 Summary:	sepolgen - Python 3 module for policy generation
 Summary(pl.UTF-8):	Moduł Pythona 3 sepolgen do generowania polityki
 License:	GPL v2
 Group:		Python/Libraries
-Requires:	python-sepolgen-common = %{version}-%{release}
 Requires:	python3-selinux >= 2.7
-# TODO: uncomment when setools supports python 3 (3.3.8 doesn't)
-#Suggests:	python-setools
+Suggests:	python3-setools
+Obsoletes:	python-sepolgen-common < 2.9-1
 BuildArch:	noarch
 
 %description -n python3-sepolgen
@@ -108,28 +75,27 @@ sepolgen - Python module for policy generation.
 %description -n python3-sepolgen -l pl.UTF-8
 Moduł Pythona sepolgen do generowania polityki.
 
-%package -n python-sepolicy
+%package -n python3-sepolicy
 Summary:	Python modules for SELinux policy manipulation
 Summary(pl.UTF-8):	Moduły Pythona do operowania na politykach SELinuksa
 Group:		Python/Libraries
 # seobject and sepolicy use translations from policycoreutils domain
 Requires:	policycoreutils >= 2.7
-Requires:	python-IPy
-Requires:	python-dbus
-Requires:	python-semanage >= 2.7
-Requires:	python-sepolgen = %{version}-%{release}
-Requires:	python-setools
-Requires:	python-slip-dbus
+Requires:	python3-IPy
+Requires:	python3-dbus
+Requires:	python3-semanage >= 2.7
+Requires:	python3-sepolgen = %{version}-%{release}
+Requires:	python3-setools
+Requires:	python3-slip-dbus
 # for sepolicy.gui additionally:
 Requires:	gtk+3 >= 3
-Requires:	python-pygobject3 >= 3
-Obsoletes:	python-sepolgen < 2.7
+Requires:	python3-pygobject3 >= 3
 Conflicts:	policycoreutils-sepolicy < 2.7
 
-%description -n python-sepolicy
+%description -n python3-sepolicy
 Python modules for SELinux policy manipulation.
 
-%description -n python-sepolicy -l pl.UTF-8
+%description -n python3-sepolicy -l pl.UTF-8
 Moduły Pythona do operowania na politykach SELinuksa.
 
 %prep
@@ -146,21 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	PYTHONLIBDIR=%{py_sitescriptdir} \
+	PYTHONLIBDIR=%{py3_sitescriptdir} \
 	LIBSEPOLA=%{_libdir}/libsepol.a
 
-#py_comp $RPM_BUILD_ROOT%{py_sitedir}
-#py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_postclean
-
-%if %{with python3}
-%{__make} -C sepolgen/src/sepolgen install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PYTHONLIBDIR=%{py3_sitescriptdir}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -180,35 +134,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sepolgen.8*
 %{_mandir}/man8/sepolicy*.8*
 %{_mandir}/man8/semanage*.8*
+%lang(ru) %{_mandir}/ru/man*/*
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
 %{bash_compdir}/semanage
 %{bash_compdir}/sepolicy
 
-%files -n python-sepolgen
-%defattr(644,root,root,755)
-%{py_sitescriptdir}/sepolgen
-
-%files -n python-sepolgen-common
-%defattr(644,root,root,755)
-%dir /var/lib/sepolgen
-%config(noreplace) %verify(not md5 mtime size) /var/lib/sepolgen/perm_map
-
 %files -n python3-sepolgen
 %defattr(644,root,root,755)
 %{py3_sitescriptdir}/sepolgen
+%dir /var/lib/sepolgen
+%config(noreplace) %verify(not md5 mtime size) /var/lib/sepolgen/perm_map
 
-%files -n python-sepolicy
+%files -n python3-sepolicy
 %defattr(644,root,root,755)
-%{py_sitescriptdir}/seobject.py[co]
-%dir %{py_sitedir}/sepolicy
-%{py_sitedir}/sepolicy/*.py[co]
-%{py_sitedir}/sepolicy/sepolicy.glade
-%dir %{py_sitedir}/sepolicy/help
-%{py_sitedir}/sepolicy/help/__init__.py[co]
-%{py_sitedir}/sepolicy/help/*.png
-%{py_sitedir}/sepolicy/help/*.txt
-%dir %{py_sitedir}/sepolicy/templates
-%{py_sitedir}/sepolicy/templates/*.py[co]
-%{py_sitedir}/sepolicy-1.1-py*.egg-info
+%{py3_sitescriptdir}/seobject.py
+%dir %{py3_sitedir}/sepolicy
+/usr/lib64/python3.7/site-packages/sepolicy/__pycache__
+%{py3_sitedir}/sepolicy/*.py
+%{py3_sitedir}/sepolicy/sepolicy.glade
+%dir %{py3_sitedir}/sepolicy/help
+/usr/lib64/python3.7/site-packages/sepolicy/help/__pycache__
+%{py3_sitedir}/sepolicy/help/__init__.py
+%{py3_sitedir}/sepolicy/help/*.png
+%{py3_sitedir}/sepolicy/help/*.txt
+%dir %{py3_sitedir}/sepolicy/templates
+/usr/lib64/python3.7/site-packages/sepolicy/templates/__pycache__
+%{py3_sitedir}/sepolicy/templates/*.py
+%{py3_sitedir}/sepolicy-1.1-py*.egg-info
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/selinux-python.git/commitdiff/eb4ac7d6d3d46e0b1003191477ddb38c92aae438

More information about the pld-cvs-commit mailing list