From e0f946676186579005d3093eddddba8be33d5f39 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Oct 06 2015 07:33:39 +0000
Subject: Upstream update to 0instal-2.10


---

diff --git a/.gitignore b/.gitignore
index 04bf391..bcb2ccc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /0install-2.6.1.tar.bz2
 /0install-2.9.1.tar.bz2
+/0install-2.10.tar.bz2
diff --git a/0install-2.10-makefile.patch b/0install-2.10-makefile.patch
new file mode 100644
index 0000000..f72ca3f
--- /dev/null
+++ b/0install-2.10-makefile.patch
@@ -0,0 +1,23 @@
+diff -up ./Makefile.translation ./Makefile
+--- ./Makefile.translation	2015-10-05 00:41:05.000000000 +1000
++++ ./Makefile	2015-10-06 17:06:42.633307106 +1000
+@@ -54,7 +54,13 @@ default: all
+ 	[ -d "${DISTDIR}" ] || mkdir "${DISTDIR}"
+ 	$(MAKE) -C "${BUILDDIR}" -f "${SRCDIR}/Makefile.build" "$@" SRCDIR="${SRCDIR}" BUILDDIR="${BUILDDIR}" DISTDIR="${DISTDIR}" DESTDIR="${DESTDIR}"
+ 
++po-files=$(shell find . -name '*.po')
++mo-files=$(subst po,mo,$(po-files))
++update-mo: ${mo-files}
++
++
+ share/locale/zero-install.pot: $(SH)
++	touch $@
+ 	xgettext --sort-by-file --language=Shell -j --output=$@ $(SH)
+ 
+ update-po: share/locale/zero-install.pot
+@@ -73,4 +79,4 @@ clean:
+ 	rm -rf build
+ 	rm -rf dist
+ 
+-.PHONY: update-po check-po clean default
++.PHONY: update-po update-mo check-po clean default
diff --git a/0install.spec b/0install.spec
index 8dc496a..5e3d0f6 100644
--- a/0install.spec
+++ b/0install.spec
@@ -1,7 +1,7 @@
 %global cache_dir /var/cache/0install.net
 %global gettext_domain_name zero-install
 Name:           0install
-Version:        2.9.1
+Version:        2.10
 Release:        1%{?dist}
 Summary:        A decentralized cross-distribution software installation system
 
@@ -12,6 +12,7 @@ Source0:        http://downloads.sf.net/project/zero-install/%{name}/%{version}/
 Patch0:         %{name}-2.6-no-tests.patch
 # multilib: use lib64 instead of lib on 64-bit arches
 Patch1:         %{name}-2.9.1-lib64.patch
+Patch2:         %{name}-2.10-makefile.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-biniou-devel
@@ -89,10 +90,11 @@ distribution, which continue to be used for other software.
 %if "%{_lib}" == "lib64"
 %patch1 -p0 -b .lib64
 %endif
-
+%patch2 -p0 -b .translation
 
 %build
 make
+make update-mo
 
 
 %install
@@ -106,6 +108,10 @@ mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 desktop-file-validate \
     $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop
 
+## Copy mo files
+mkdir -p %{buildroot}%{_datadir}/locale
+cp -R build/share/locale/* %{buildroot}%{_datadir}/locale
+
 %find_lang %{gettext_domain_name}
 
 ## Remove excess doc
@@ -157,6 +163,9 @@ fi
 
 
 %changelog
+* Tue Oct 06 2015 Ding-Yi Chen <dchen@redhat.com> - 2.10-1
+- Upstream update to 2.10.
+
 * Thu Oct 01 2015 Ding-Yi Chen <dchen@redhat.com> - 2.9.1-1
 - Upstream update to 2.9.1.
 - Add buildrequires: ocaml-react-devel for EPEL.
diff --git a/sources b/sources
index c903da4..477831d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37093e67e3ae21a89f3b7fb217941437  0install-2.9.1.tar.bz2
+3db5bca7df2c01f9c74e57b503d9dd39  0install-2.10.tar.bz2