- golang src dir tree has been flattened in 1.4

- rel 2

diff --git a/golang14nosrcpkg.patch b/golang14nosrcpkg.patch
new file mode 100644 (file)
index 0000000..169db51
--- /dev/null
+++ b/golang14nosrcpkg.patch
@@ -0,0 +1,11 @@
+--- libguestfs-1.28.10/golang/Makefile.am~     2015-05-06 19:40:49.000000000 +0200
++++ libguestfs-1.28.10/golang/Makefile.am      2015-07-21 09:41:24.756946520 +0200
+@@ -43,7 +43,7 @@
+ endif
+ 
+ golangpkgdir = $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/$(pkg)
+-golangsrcdir = $(GOROOT)/src/pkg/$(pkg)
++golangsrcdir = $(GOROOT)/src/$(pkg)
+ 
+ golangpkg_DATA = \
+       pkg/$(GOOS)_$(GOARCH)/$(pkg).a

diff --git a/libguestfs.spec b/libguestfs.spec
index 695040d354bdd5ba1511b5a0606de9b08e4e7538..e14c20da4a291c8d68b1c0e3a37690dbc1f8bb47 100644 (file)
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -36,7 +36,7 @@ Summary:      Library and tools for accessing and modifying virtual machine disk imag
 Summary(pl.UTF-8):     Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych
 Name:          libguestfs
 Version:       1.28.10
-Release:       1
+Release:       2
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
@@ -45,6 +45,7 @@ Patch0:               ncurses.patch
 Patch1:                augeas-libxml2.patch
 Patch2:                %{name}-link.patch
 Patch3:                %{name}-completionsdir.patch
+Patch4:                golang14nosrcpkg.patch
 URL:           http://libguestfs.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -433,6 +434,7 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # preserve dir across libtoolize
@@ -779,7 +781,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/golang/pkg/linux_*/libguestfs.org
 %dir %{_libdir}/golang/pkg/linux_*/libguestfs.org/guestfs
 %{_libdir}/golang/pkg/linux_*/libguestfs.org/guestfs/guestfs.a
-%{_libdir}/golang/src/pkg/libguestfs.org
+%{_libdir}/golang/src/libguestfs.org
 %{_mandir}/man3/guestfs-golang.3*
 %lang(ja) %{_mandir}/ja/man3/guestfs-golang.3*
 %lang(uk) %{_mandir}/uk/man3/guestfs-golang.3*