commit 68b7237e472cf83faca8ea392ca20d57c68c7439
Author: Jakub Bogusz <[email protected]>
Date: Sat Jun 25 10:00:19 2016 +0200
- updated to 2016.6
grub2-pld.patch | 4 ++--
ostree.spec | 36 +++++++++++++++++++++---------------
2 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/ostree.spec b/ostree.spec
index ba1f7ca..38223e2 100644
--- a/ostree.spec
+++ b/ostree.spec
@@ -5,18 +5,18 @@
Summary: OSTree - Git for operating system binaries
Summary(pl.UTF-8): OSTree - Git dla binariów systemów operacyjnych
Name: ostree
-Version: 2016.1
+Version: 2016.6
Release: 1
License: LGPL v2+
Group: Libraries
-#Source0:
http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.xz
-Source0:
https://github.com/GNOME/ostree/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 57d48d855980b85be992cc7050026314
-# official https://git.gnome.org/browse/libglnx
-Source1:
https://github.com/GNOME/libglnx/archive/03138641298fd6799f46b16423871f959332bacf/libglnx.tar.gz
-# Source1-md5: c7234e0156af5480e9fa8eef85f7d107
-Source2:
https://github.com/mendsley/bsdiff/archive/1edf9f656850c0c64dae260960fabd8249ea9c60/bsdiff.tar.gz
-# Source2-md5: 38464abb5e66b0c8dfbcf94fba6a8004
+#Source0Download: https://github.com/ostreedev/ostree/releases
+Source0:
https://github.com/ostreedev/ostree/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 9e05076e5b77afb0533c61fde240a3e1
+# for non-release checkouts
+#Source1:
https://github.com/GNOME/libglnx/archive/03138641298fd6799f46b16423871f959332bacf/libglnx.tar.gz
+## Source1-md5: c7234e0156af5480e9fa8eef85f7d107
+#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
@@ -28,7 +28,9 @@ BuildRequires: gobject-introspection-devel >= 1.34.0
BuildRequires: gpgme-devel >= 1.1.8
BuildRequires: gtk-doc >= 1.15
BuildRequires: libarchive-devel >= 2.8.0
+BuildRequires: libfuse-devel >= 2.9.2
BuildRequires: libgsystem-devel >= 2015.1
+BuildRequires: libmount >= 2.23.0
BuildRequires: libselinux-devel >= 2.2
BuildRequires: libsoup-devel >= 2.39.1
BuildRequires: libtool >= 2:2.2.4
@@ -129,15 +131,17 @@ OSTree support for Dracut.
Obsługa OSTree dla Dracuta.
%prep
-%setup -q -a1 -a2
+%setup -q
%patch0 -p1
-rmdir libglnx bsdiff
-%{__mv} libglnx-* libglnx
-%{__mv} bsdiff-* bsdiff
+
+# for non-release checkouts
+#rmdir libglnx bsdiff
+#%{__mv} libglnx-* libglnx
+#%{__mv} bsdiff-* bsdiff
# see autogen.sh
-sed -e 's,$(libglnx_srcpath),'./libglnx,g < libglnx/Makefile-libglnx.am
>libglnx/Makefile-libglnx.am.inc
-sed -e 's,$(libbsdiff_srcpath),'./bsdiff,g < bsdiff/Makefile-bsdiff.am
>bsdiff/Makefile-bsdiff.am.inc
+sed -e 's,$(libglnx_srcpath),libglnx,g' < libglnx/Makefile-libglnx.am
>libglnx/Makefile-libglnx.am.inc
+sed -e 's,$(libbsdiff_srcpath),bsdiff,g' < bsdiff/Makefile-bsdiff.am
>bsdiff/Makefile-bsdiff.am.inc
%build
%{__libtoolize}
@@ -175,12 +179,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.md TODO
%attr(755,root,root) %{_bindir}/ostree
+%attr(755,root,root) %{_bindir}/rofiles-fuse
%attr(755,root,root) %{_libdir}/libostree-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libostree-1.so.1
%{_libdir}/girepository-1.0/OSTree-1.0.typelib
%{_datadir}/ostree
%{_mandir}/man1/ostree.1*
%{_mandir}/man1/ostree-*.1*
+%{_mandir}/man1/rofiles-fuse.1*
%{_mandir}/man5/ostree.repo.5*
%{_mandir}/man5/ostree.repo-config.5*
diff --git a/grub2-pld.patch b/grub2-pld.patch
index 0008a7f..046b47b 100644
--- a/grub2-pld.patch
+++ b/grub2-pld.patch
@@ -1,5 +1,5 @@
---- 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
+--- ostree-2016.6/src/boot/grub2/grub2-15_ostree~ 2015-04-07
22:18:45.000000000 +0200
++++ ostree-2016.6/src/boot/grub2/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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ostree.git/commitdiff/68b7237e472cf83faca8ea392ca20d57c68c7439
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
