From aac59394a0dd4471d5a5dac2d61c4d24c94c5fb6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 06 2014 18:58:56 +0000
Subject: Merge branch 'epel7' into el6


---

diff --git a/.gitignore b/.gitignore
index 0065d11..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/lbzip2-0.23.tar.gz
-/lbzip2-2.0.tar.gz
-/lbzip2-2.1.tar.gz
-/lbzip2-2.1-gl1.tar.gz
-/lbzip2-2.2.tar.gz
+/*.tar.*
diff --git a/lbzip2.spec b/lbzip2.spec
index 57a37f2..020c485 100644
--- a/lbzip2.spec
+++ b/lbzip2.spec
@@ -1,11 +1,11 @@
 Name:           lbzip2
-Version:        2.2
+Version:        2.5
 Release:        1%{?dist}
 Summary:        Fast, multi-threaded bzip2 utility
 Group:          Applications/File
 License:        GPLv3+
-URL:            https://github.com/kjn/lbzip2
-Source0:        https://github.com/downloads/kjn/%{name}/%{name}-%{version}.tar.gz
+URL:            http://lbzip2.org/
+Source0:        http://archive.lbzip2.org/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -20,8 +20,8 @@ decompressor.
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%configure --enable-warnings
+make %{?_smp_mflags} V=1
 
 
 %install
@@ -39,7 +39,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
 %{_bindir}/lbzcat
 %{_bindir}/lbunzip2
@@ -49,6 +49,40 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 27 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.5-1
+- Update to upstream version 2.5
+
+* Wed Mar 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-4
+- Add patch for performance regression during compression
+
+* Wed Mar 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-3
+- Fix a typo in compression order block patch
+
+* Wed Mar 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-2
+- Add patch fixing block ordering during compression
+
+* Mon Mar 24 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4-1
+- Update to upstream version 2.4
+
+* Sun Dec 22 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.3-3
+- Drop INSTALL from docs.
+- Fix bogus dates in %%changelog.
+- Use bzipped source tarball.
+
+* Sun Oct 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3-2
+- Add patch to fix sefgault during decompression
+- Resolves: rhbz#1017957
+- Update upstream URLs
+
+* Tue Oct 15 2013 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.3-1
+- Version bump
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Aug 14 2012 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.2-1
 - version bump to 2.2
 
@@ -64,7 +98,7 @@ rm -rf %{buildroot}
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Wed Nov 24 2011 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.1-1
+* Thu Nov 24 2011 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.1-1
 - update to 2.1 security release
 
 * Tue Nov 22 2011 Lukas Zapletal <lzap+rpm[@]redhat.com> - 2.0-2
@@ -82,7 +116,7 @@ rm -rf %{buildroot}
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Wed Dec 09 2010 Lukas Zapletal <lzap+spam@redhat.com> - 0.23-2
+* Thu Dec 09 2010 Lukas Zapletal <lzap+spam@redhat.com> - 0.23-2
 - Updated files section and patches description
 
 * Thu Nov 25 2010 Lukas Zapletal <lzap+spam@redhat.com> - 0.23-1
diff --git a/sources b/sources
index 6f5bb10..9b99001 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abf7e703425a5da3c91c580a69bb843a  lbzip2-2.2.tar.gz
+91d2d25798229cb34c1258ecee503fd4  lbzip2-2.5.tar.bz2