[packages/ostree] - compatibility with PLD grub2 - rel 2

[baggins]

commit d20967bf249412de381a63ea3a9cec1d84b3a5a8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 26 22:32:57 2015 +0200

    - compatibility with PLD grub2
    - rel 2

 grub2-pld.patch | 22 ++++++++++++++++++++++
 ostree.spec     |  6 ++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/ostree.spec b/ostree.spec
index 748a741..1d70688 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -6,7 +6,7 @@ Summary:	OSTree - Git for operating system binaries
 Summary(pl.UTF-8):	OSTree - Git dla binariów systemów operacyjnych
 Name:		ostree
 Version:	2015.5
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		Libraries
 #Source0:	http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.xz
@@ -17,6 +17,7 @@ Source1:	https://github.com/GNOME/libglnx/archive/371172bcfd869867cf1c2847fcbbb3
 # Source1-md5:	2de1e869bbf3a0b77b88bfe09637c556
 Source2:	https://github.com/mendsley/bsdiff/archive/1edf9f656850c0c64dae260960fabd8249ea9c60/bsdiff.tar.gz
 # Source2-md5:	38464abb5e66b0c8dfbcf94fba6a8004
+Patch0:		grub2-pld.patch
 URL:		https://wiki.gnome.org/OSTree
 BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.63
@@ -129,6 +130,7 @@ Obsługa OSTree dla Dracuta.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 rmdir libglnx bsdiff
 %{__mv} libglnx-* libglnx
 %{__mv} bsdiff-* bsdiff
@@ -201,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files grub2
 %defattr(644,root,root,755)
-/etc/grub.d/15_ostree
+/lib/grub.d/15_ostree
 %dir %{_libexecdir}/ostree
 %attr(755,root,root) %{_libexecdir}/ostree/grub2-15_ostree
 
diff --git a/grub2-pld.patch b/grub2-pld.patch
new file mode 100644
index 0000000..0008a7f
--- /dev/null
+++ b/grub2-pld.patch
@@ -0,0 +1,22 @@
+--- ostree-2015.5/src/boot/grub2-15_ostree~	2015-04-07 22:18:45.000000000 +0200
++++ ostree-2015.5/src/boot/grub2-15_ostree	2015-04-26 22:28:48.389129605 +0200
+@@ -35,7 +35,7 @@
+ # it's a lot better than reimplementing the config-generating bits of
+ # OSTree in shell script.
+ 
+-. /usr/share/grub/grub-mkconfig_lib
++. /lib/grub/grub-mkconfig_lib
+ 
+ DEVICE=${GRUB_DEVICE_BOOT:-${GRUB_DEVICE}}
+ 
+--- ostree-2015.5/Makefile-boot.am~	2015-04-07 22:18:45.000000000 +0200
++++ ostree-2015.5/Makefile-boot.am	2015-04-26 22:30:39.565800921 +0200
+@@ -45,7 +45,7 @@
+ install-grub2-config-hook:
+ 	mkdir -p $(DESTDIR)$(grub2configdir)
+ 	ln -sf $(pkglibexecdir)/grub2-15_ostree $(DESTDIR)$(grub2configdir)/15_ostree
+-grub2configdir = $(sysconfdir)/grub.d
++grub2configdir = /lib/grub.d
+ INSTALL_DATA_HOOKS += install-grub2-config-hook
+ endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ostree.git/commitdiff/d20967bf249412de381a63ea3a9cec1d84b3a5a8