From 7da34c6fdbeb3b9c2727015bfa655ffe2b96b120 Mon Sep 17 00:00:00 2001
From: Takanori MATSUURA <t.matsuu@gmail.com>
Date: Aug 05 2011 15:57:23 +0000
Subject: Merge branch 'master' into el5


Conflicts:
	autoconf-archive.spec

---

diff --git a/autoconf-archive-2011.07.17.tar.xz b/autoconf-archive-2011.07.17.tar.xz
new file mode 100644
index 0000000..da8ccd2
Binary files /dev/null and b/autoconf-archive-2011.07.17.tar.xz differ
diff --git a/autoconf-archive.spec b/autoconf-archive.spec
index 3183507..d513231 100644
--- a/autoconf-archive.spec
+++ b/autoconf-archive.spec
@@ -1,5 +1,5 @@
 Name: autoconf-archive
-Version: 2011.04.12
+Version: 2011.07.17
 Release: 1%{?dist}
 Summary: The Autoconf Macro Archive
 
@@ -20,8 +20,7 @@ GNU Autoconf that have been contributed as free software by friendly
 supporters of the cause from all over the Internet.
 
 %prep
-xzcat %{SOURCE0} | tar -xf -
-%setup -qDT
+%setup -q
 
 %build
 %configure
@@ -53,6 +52,9 @@ fi
 %{_infodir}/autoconf-archive.info*
 
 %changelog
+* Fri Aug  5 2011 Takanori MATSUURA <t.matsuu@gmail.com> - 2011.07.17-1
+- update to 2011.07.17
+
 * Thu May 26 2011 Takanori MATSUURA <t.matsuu@gmail.com> - 2011.04.12-1
 - initial release