From 545a7d71e7d916719491b7612204f582a5af97ee Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Nov 03 2014 18:17:06 +0000
Subject: Merge branch 'master' into el5


Conflicts:
	.gitignore
	bindfs.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index f91b32d..5fd5798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-bindfs-1.8.3.tar.gz
+/bindfs-1.11.tar.gz
+/bindfs-1.12.2.tar.gz
+/bindfs-1.12.3.tar.gz
+/bindfs-1.12.4.tar.gz
+/bindfs-1.12.6.tar.gz
diff --git a/bindfs.spec b/bindfs.spec
index 885d1af..e5528a7 100644
--- a/bindfs.spec
+++ b/bindfs.spec
@@ -1,16 +1,17 @@
+%global _hardened_build 1
+
 Name:           bindfs
-Version:        1.8.3
-Release:        3%{?dist}
+Version:        1.12.6
+Release:        1%{?dist}
 Summary:        Fuse filesystem to mirror a directory
 
 Group:          System Environment/Base
 License:        GPLv2+
-URL:            http://code.google.com/p/bindfs/
-Source0:        http://bindfs.googlecode.com/files/bindfs-%{version}.tar.gz
+URL:            http://bindfs.org/
+Source0:        http://bindfs.org/downloads//bindfs-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel
-BuildRequires:  recode
 
 
 %description
@@ -20,7 +21,6 @@ the mirror directory.
 
 %prep
 %setup -q
-recode latin1..utf8 ChangeLog
 
 
 %build
@@ -45,6 +45,46 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 03 2014 Till Maas <opensource@till.name> - 1.12.6-1
+- Update to new release
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.12.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jun 05 2014 Till Maas <opensource@till.name> - 1.12.4-1
+- Update to new release
+
+* Wed Jan 15 2014 Till Maas <opensource@till.name> - 1.12.3-1
+- Update to new release
+- Harden build
+
+* Thu Jul 25 2013 Till Maas <opensource@till.name> - 1.12.2-1
+- Update to new release
+- Update URL
+- Update source URL
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Sep 26 2012 Till Maas <opensource@till.name> - 1.11-1
+- Update to new release
+- Do not recode ChangeLog anymore
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Mar 13 2012 Till Maas <opensource@till.name> - 1.10-1
+- Update to new release
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Sep 17 2009 Peter Lemenkov <lemenkov@gmail.com> - 1.8.3-3
 - Rebuilt with new fuse
 
diff --git a/sources b/sources
index ae7d8ed..8340d86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ff4eafc37ce7ed4092bd6fec086e7cf  bindfs-1.8.3.tar.gz
+945a4b3f8d3647f61a22a3edd7064b88  bindfs-1.12.6.tar.gz