[packages/audit] - up to 2.4.3 - added python3 bindings - fixed golang bindings path

baggins baggins at pld-linux.org
Tue Jul 21 09:39:29 CEST 2015


commit 2d0ad02a06993dc29e24f75567372fc0ef79db1f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jul 21 09:38:52 2015 +0200

    - up to 2.4.3
    - added python3 bindings
    - fixed golang bindings path

 audit.spec         | 40 ++++++++++++++++++++++++++++++++++++----
 golang-paths.patch |  2 +-
 2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index e456a91..7f3f76f 100644
--- a/audit.spec
+++ b/audit.spec
@@ -4,6 +4,7 @@
 %bcond_without	prelude		# prelude audisp plugin
 %bcond_without	golang		# Go language bindings
 %bcond_without	python		# Python bindings
+%bcond_without	python3		# Python3 bindings
 %bcond_without	zos_remote	# zos-remote audisp plugin (LDAP dep)
 
 %ifnarch %{ix86} %{x8664} %{arm}
@@ -13,12 +14,12 @@
 Summary:	User space tools for 2.6 kernel auditing
 Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:		audit
-Version:	2.4.2
+Version:	2.4.3
 Release:	1
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
-# Source0-md5:	52e535e449f6fb80a4491267e35f1cec
+# Source0-md5:	544d863af2016b76afd8d1691b251164
 Source2:	%{name}d.init
 Source3:	%{name}d.sysconfig
 Patch0:		%{name}-install.patch
@@ -49,6 +50,11 @@ BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	swig-python
 %endif
+%if %{with python3}
+BuildRequires:	python3-devel
+BuildRequires:	rpm-pythonprov
+BuildRequires:	swig-python
+%endif
 BuildRequires:	rpmbuild(macros) >= 1.623
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
@@ -162,6 +168,19 @@ Python interface to libaudit library.
 %description -n python-audit -l pl.UTF-8
 Pythonowy interfejs do biblioteki libaudit.
 
+%package -n python3-audit
+Summary:	Python interface to libaudit library
+Summary(pl.UTF-8):	Pythonowy interfejs do biblioteki libaudit
+License:	LGPL v2.1+
+Group:		Libraries/Python
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description -n python3-audit
+Python interface to libaudit library.
+
+%description -n python3-audit -l pl.UTF-8
+Pythonowy interfejs do biblioteki libaudit.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -223,6 +242,10 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libauparse.so.*.*.*) \
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 %endif
 
+%if %{with python}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/*.{la,a}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -330,6 +353,7 @@ fi
 %{_includedir}/auparse*.h
 %{_includedir}/libaudit.h
 %{_pkgconfigdir}/audit.pc
+%{_pkgconfigdir}/auparse.pc
 %{_mandir}/man3/audit_*.3*
 %{_mandir}/man3/auparse_*.3*
 %{_mandir}/man3/ausearch_*.3*
@@ -354,8 +378,8 @@ fi
 %if %{with golang}
 %files -n golang-audit
 %defattr(644,root,root,755)
-%dir %{_libdir}/golang/src/pkg/redhat.com
-%{_libdir}/golang/src/pkg/redhat.com/audit
+%dir %{_libdir}/golang/src/redhat.com
+%{_libdir}/golang/src/redhat.com/audit
 %endif
 
 %if %{with python}
@@ -365,3 +389,11 @@ fi
 %attr(755,root,root) %{py_sitedir}/auparse.so
 %{py_sitedir}/audit.py[co]
 %endif
+
+%if %{with python3}
+%files -n python3-audit
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/_audit.so
+%attr(755,root,root) %{py3_sitedir}/auparse.so
+%{py3_sitedir}/audit.py
+%endif
diff --git a/golang-paths.patch b/golang-paths.patch
index 6dc073f..2505cec 100644
--- a/golang-paths.patch
+++ b/golang-paths.patch
@@ -6,7 +6,7 @@
  
 -LIBDIR = lib
 -GODIR = $(LIBDIR)/golang/src/pkg/redhat.com/audit
-+GODIR = ${libdir}/golang/src/pkg/redhat.com/audit
++GODIR = ${libdir}/golang/src/redhat.com/audit
  dist_check_SCRIPTS = test.go
  
  install:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/2d0ad02a06993dc29e24f75567372fc0ef79db1f



More information about the pld-cvs-commit mailing list