From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 10 Jul 2015 17:21:38 +0000 (+0000)
Subject: - ehh, fix sysctl.d path
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=6a3aea129d7eb0d04011cf9beefd2b6472495b7d;p=packages%2Flibvirt.git

- ehh, fix sysctl.d path
---

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
new file mode 100644
index 0000000..7ce574d
--- /dev/null
+++ b/libvirt-sysctl-dir.patch
@@ -0,0 +1,19 @@
+diff -ur libvirt-1.2.17.orig/daemon/Makefile.am libvirt-1.2.17/daemon/Makefile.am
+--- libvirt-1.2.17.orig/daemon/Makefile.am	2015-06-25 14:00:33.000000000 +0000
++++ libvirt-1.2.17/daemon/Makefile.am	2015-07-10 16:28:56.157230844 +0000
+@@ -396,13 +396,11 @@
+ # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+ # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+ install-sysctl:
+-	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
+ 	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
+-	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
++	  $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ 
+ uninstall-sysctl:
+-	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+-	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
++	rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ else ! WITH_SYSCTL
+ install-sysctl:
+ uninstall-sysctl:
diff --git a/libvirt.spec b/libvirt.spec
index 6766c36..564b28d 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -41,7 +41,7 @@ Summary:	Toolkit to interact with virtualization capabilities
 Summary(pl.UTF-8):	Narzędzia współpracujące z funkcjami wirtualizacji
 Name:		libvirt
 Version:	1.2.17
-Release:	2
+Release:	3
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -56,6 +56,7 @@ Patch5:		%{name}-udevadm-settle.patch
 Patch6:		vserver.patch
 Patch7:		bashisms.patch
 Patch8:		%{name}-guests.init.patch
+Patch9:		%{name}-sysctl-dir.patch
 URL:		http://www.libvirt.org/
 BuildRequires:	audit-libs-devel
 BuildRequires:	augeas-devel
@@ -420,6 +421,7 @@ Sondy systemtap/dtrace dla libvirt.
 %{?with_vserver:%patch6 -p1}
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -517,7 +519,7 @@ Sondy systemtap/dtrace dla libvirt.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,sysctl.d,rc.d/init.d}
 
 %{__make} install \
 	DEVHELP_DIR=%{_gtkdocdir}/%{name}/devhelp \