From c8d90b0a98448d676d3be7fa6bfd006fd9d58471 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sep 05 2012 19:32:38 +0000
Subject: Merge branch 'master' into f17


Conflicts:
	.gitignore
	ark.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 305374f..012af6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/ark-4.8.3.tar.xz
-/ark-4.8.4.tar.xz
 /ark-4.8.5.tar.xz
+/ark-4.9.1.tar.xz
diff --git a/ark.spec b/ark.spec
index 6c263e7..e411f3b 100644
--- a/ark.spec
+++ b/ark.spec
@@ -1,7 +1,6 @@
-
 Name:    ark
 Summary: Archive manager
-Version: 4.8.5
+Version: 4.9.1
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -20,12 +19,13 @@ Patch50: ark-4.7.80-namelink_skip.patch
 
 ## upstream patches
 
+BuildRequires: bzip2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdebase4-devel >= %{version}
-BuildRequires: libzip-devel
+BuildRequires: kde-baseapps-devel >= %{version}
 BuildRequires: pkgconfig(libarchive)
 BuildRequires: pkgconfig(liblzma) 
+BuildRequires: zlib-devel
 # need only for ark unit tests
 #BuildRequires: pkgconfig(QJson) 
 
@@ -122,11 +122,29 @@ fi
 
 
 %changelog
-* Thu Aug 02 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.5-1
-- 4.8.5
+* Mon Sep 03 2012 Than Ngo <than@redhat.com> - 4.9.1-1
+- 4.9.1
+
+* Thu Jul 26 2012 Lukas Tinkl <ltinkl@redhat.com> - 4.9.0-1
+- 4.9.0
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.8.97-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jul 11 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.97-1
+- 4.8.97
+
+* Tue Jul 10 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.95-2
+- update builddeps
+
+* Thu Jun 28 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.95-1
+- 4.8.95
+
+* Sat Jun 09 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.90-1
+- 4.8.90
 
-* Mon Jun 04 2012 Than Ngo <than@redhat.com> - 4.8.4-1
-- 4.8.4
+* Fri Jun 01 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.80-1
+- 4.8.80
 
 * Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
 - 4.8.3
diff --git a/sources b/sources
index 00e4b1d..81ea8e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb53d5f5491961a4f20dac29761e020f  ark-4.8.5.tar.xz
+5082c4154fc7e3afb10cd4b7264d0f1f  ark-4.9.1.tar.xz