From 3a6b6497d03d54bd87be9b0f8133294dbb5661e6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Mon, 14 Jan 2013 17:20:29 +0100
Subject: [PATCH] Update to 3.1.1

- NEWS seems to be valid UTF-8 nowadays
---
 .gitignore      |  1 +
 libarchive.spec | 17 +++++++++++------
 sources         |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 83744cc..3feacb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ libarchive-2.8.4.tar.gz
 /libarchive-3.0.0a.tar.gz
 /libarchive-3.0.3.tar.gz
 /libarchive-3.0.4.tar.gz
+/v3.1.1.tar.gz
diff --git a/libarchive.spec b/libarchive.spec
index 1002c02..8b2a2bb 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,12 +1,12 @@
 Name:           libarchive
-Version:        3.0.4
-Release:        3%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://code.google.com/p/libarchive/
-Source0:        https://github.com/downloads/libarchive/libarchive/%{name}-%{version}.tar.gz
+URL:            http://libarchive.github.com/
+Source0:        https://github.com/libarchive/libarchive/archive/v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -21,6 +21,7 @@ BuildRequires: libattr-devel
 BuildRequires: openssl-devel
 BuildRequires: libxml2-devel
 BuildRequires: libunistring-devel
+BuildRequires: automake autoconf libtool
 
 
 %description
@@ -62,6 +63,7 @@ libarchive packages.
 
 
 %build
+build/autogen.sh
 %configure --disable-static --disable-rpath
 # remove rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -72,7 +74,6 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-iconv -f latin1 -t utf-8 < NEWS > NEWS.utf8; cp NEWS.utf8 NEWS
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -88,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README NEWS
-%{_libdir}/libarchive.so.12*
+%{_libdir}/libarchive.so.13*
 %{_mandir}/*/cpio.*
 %{_mandir}/*/mtree.*
 %{_mandir}/*/tar.*
@@ -117,6 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 14 2013 Tomas Bzatek <tbzatek@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+- NEWS seems to be valid UTF-8 nowadays
+
 * Wed Oct 03 2012 Pavel Raiskup <praiskup@redhat.com> - 3.0.4-3
 - better install manual pages for libarchive/bsdtar/bsdcpio (# ... )
 - several fedora-review fixes ...:
diff --git a/sources b/sources
index 1f11f65..4572e2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af443ca9a10ddbcbf00f7ae34ca7fc16  libarchive-3.0.4.tar.gz
+b482463d73370bdbe8e234095a6ef6c9  v3.1.1.tar.gz