diff --git a/automake.patch b/automake.patch new file mode 100644 index 0000000..1ff4b47 --- /dev/null +++ b/automake.patch @@ -0,0 +1,11 @@ +--- builder/Makefile.in.old 2014-03-02 13:28:33.348057819 +0000 ++++ builder/Makefile.in 2014-03-02 13:28:18.482107909 +0000 +@@ -1634,7 +1634,7 @@ + DISTCLEANFILES = .depend + + # virt-builder's default repository +-repoconfdir = $(sysconfdir)/xdg/virt-builder/repos.d ++repoconfdir = $(sysconfdir)/virt-builder/repos.d + repoconf_DATA = libguestfs.conf libguestfs.gpg + virt_index_validate_SOURCES = \ + index-parse.y \ diff --git a/libguestfs.spec b/libguestfs.spec index fa09022..fcd84ae 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -20,7 +20,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.25.39 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ # Source and patches. @@ -30,6 +30,8 @@ Source0: http://libguestfs.org/download/1.25-development/%{name}-%{version # Non-upstream patch to move virt-builder configuration files to # /etc/virt-builder. Patch1: 0001-builder-Move-repos-configuration-to-etc-virt-builder.patch +# Automake changes in above patch. +Patch2: automake.patch # Basic build requirements: BuildRequires: perl(Pod::Simple) @@ -675,6 +677,7 @@ for %{name}. %setup -q %patch1 -p1 +%patch2 -p0 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then # For sVirt to work, the local temporary directory we use in the @@ -1136,7 +1139,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog -* Sun Mar 02 2014 Richard W.M. Jones - 1:1.25.39-1 +* Sun Mar 02 2014 Richard W.M. Jones - 1:1.25.39-2 - New upstream version 1.25.39. * Fri Feb 28 2014 Richard W.M. Jones - 1:1.25.38-4