- fix hardcoded lib dir in golang bindings

- rel 2

diff --git a/audit.spec b/audit.spec
index 098f0ee340654589cd91b173476d2abae95e02e0..798893d17cb3d99ad9dcbff421736ff51514fcf4 100644 (file)
--- 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 (file)
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