From fb8561b759f2e07028a6054aab2c1827097ab0d9 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Tue, 12 May 2009 12:38:37 +0000
Subject: [PATCH] - Update to 2.7.0

---
 .cvsignore                            |  2 +-
 libarchive-2.7.0-disable-werror.patch | 12 ++++++++++++
 libarchive.spec                       | 22 +++++++++++++++++++---
 sources                               |  2 +-
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 libarchive-2.7.0-disable-werror.patch

diff --git a/.cvsignore b/.cvsignore
index 62b5bad..641394e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libarchive-2.6.2.tar.gz
+libarchive-2.7.0.tar.gz
diff --git a/libarchive-2.7.0-disable-werror.patch b/libarchive-2.7.0-disable-werror.patch
new file mode 100644
index 0000000..a817102
--- /dev/null
+++ b/libarchive-2.7.0-disable-werror.patch
@@ -0,0 +1,12 @@
+diff -up libarchive-2.7.0/Makefile.am.orig libarchive-2.7.0/Makefile.am
+--- libarchive-2.7.0/Makefile.am.orig	2009-04-08 09:37:15.000000000 +0200
++++ libarchive-2.7.0/Makefile.am	2009-05-12 14:12:39.000000000 +0200
+@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bsd
+ # Especially for early development, we want to be a little
+ # aggressive about diagnosing build problems; this can get
+ # relaxed somewhat in final shipping versions.
+-AM_CFLAGS=-Wall -Werror
++AM_CFLAGS=-Wall
+ 
+ #
+ # What to include in the distribution
diff --git a/libarchive.spec b/libarchive.spec
index 23fcba7..8eb147f 100644
--- a/libarchive.spec
+++ b/libarchive.spec
@@ -1,5 +1,5 @@
 Name:           libarchive
-Version:        2.6.2
+Version:        2.7.0
 Release:        1%{?dist}
 Summary:        A library for handling streaming archive formats 
 
@@ -9,13 +9,23 @@ URL:            http://code.google.com/p/libarchive/
 Source0:        http://libarchive.googlecode.com/files/libarchive-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
+# Disable -Werror
+Patch0:         libarchive-2.7.0-disable-werror.patch
+
+BuildRequires: bison
+BuildRequires: sharutils
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
-BuildRequires: sharutils
 BuildRequires: lzma-devel
 BuildRequires: e2fsprogs-devel
 BuildRequires: libacl-devel
 BuildRequires: libattr-devel
+BuildRequires: openssl-devel
+
+# The patch touches Makefile.am files:
+BuildRequires: automake autoconf
+BuildRequires: libtool
 
 %description
 Libarchive is a programming library that can create and read several different 
@@ -35,10 +45,13 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .werror
 
 
 %build
-%configure --disable-static --disable-bsdtar
+libtoolize --force  || :
+autoreconf  || :
+%configure --disable-static --disable-bsdtar --disable-bsdcpio
 make %{?_smp_mflags}
 
 
@@ -76,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 12 2009 Tomas Bzatek <tbzatek@redhat.com> 2.7.0-1
+- Update to 2.7.0
+
 * Fri Mar  6 2009 Tomas Bzatek <tbzatek@redhat.com> 2.6.2-1
 - Update to 2.6.2
 
diff --git a/sources b/sources
index 010174c..493cce6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e31fcacd3f2b996988c0852a5edfc680  libarchive-2.6.2.tar.gz
+a2103ca334037562ad327eb3aed54869  libarchive-2.7.0.tar.gz