[packages/audit] - fix hardcoded lib dir in golang bindings - rel 2

baggins baggins at pld-linux.org
Thu Oct 23 07:42:36 CEST 2014


commit 23c6312b25e48d02bc2601aa8c35a6afdef129d7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 23 07:42:11 2014 +0200

    - fix hardcoded lib dir in golang bindings
    - rel 2

 audit.spec         |  4 +++-
 golang-paths.patch | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/audit.spec b/audit.spec
index 098f0ee..798893d 100644
--- a/audit.spec
+++ b/audit.spec
@@ -10,7 +10,7 @@ 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
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@ Patch4:		%{name}-systemd-notonly.patch
 Patch5:		%{name}-am.patch
 Patch6:		%{name}-no-refusemanualstop.patch
 Patch7:		%{name}-cronjob.patch
+Patch8:		golang-paths.patch
 URL:		http://people.redhat.com/sgrubb/audit/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -165,6 +166,7 @@ Pythonowy interfejs do biblioteki libaudit.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %if %{without python}
 sed 's#swig/Makefile ##' -i configure.ac
diff --git a/golang-paths.patch b/golang-paths.patch
new file mode 100644
index 0000000..6dc073f
--- /dev/null
+++ b/golang-paths.patch
@@ -0,0 +1,23 @@
+--- audit-2.4/bindings/golang/Makefile.am~	2014-08-24 18:39:23.000000000 +0200
++++ audit-2.4/bindings/golang/Makefile.am	2014-10-23 07:36:39.764147566 +0200
+@@ -23,16 +23,15 @@
+ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
+ EXTRA_DIST = audit.go
+ 
+-LIBDIR = lib
+-GODIR = $(LIBDIR)/golang/src/pkg/redhat.com/audit
++GODIR = ${libdir}/golang/src/pkg/redhat.com/audit
+ dist_check_SCRIPTS = test.go
+ 
+ install:
+-	[ -d $(DESTDIR)${prefix}/$(GODIR) ] || mkdir -p $(DESTDIR)${prefix}/$(GODIR)
+-	install -m 644 ${top_srcdir}/bindings/golang/audit.go $(DESTDIR)${prefix}/$(GODIR)
++	[ -d $(DESTDIR)/$(GODIR) ] || mkdir -p $(DESTDIR)/$(GODIR)
++	install -m 644 ${top_srcdir}/bindings/golang/audit.go $(DESTDIR)/$(GODIR)
+ 
+ uninstall:
+-	@rm -f $(DESTDIR)${prefix}/$(GODIR)/*
++	@rm -f $(DESTDIR)/$(GODIR)/*
+ 
+ check:
+ 	@mkdir audit
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audit.git/commitdiff/23c6312b25e48d02bc2601aa8c35a6afdef129d7



More information about the pld-cvs-commit mailing list