From df3db2a617fb837ee5f3ee1c93379a18acd03180 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Apr 24 2013 20:49:27 +0000 Subject: Merge branch 'master' into f18 --- diff --git a/ark.spec b/ark.spec index a41a47a..c427582 100644 --- a/ark.spec +++ b/ark.spec @@ -1,7 +1,11 @@ +%if 0%{?fedora} +%global p7zip 1 +%endif + Name: ark Summary: Archive manager Version: 4.10.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -43,7 +47,9 @@ Provides: kdeutils-ark = 6:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%if 0%{?p7zip} Requires: p7zip-plugins +%endif %description Ark is a program for managing various archive formats. @@ -128,6 +134,9 @@ fi %changelog +* Wed Apr 24 2013 Than Ngo - 4.10.2-2 +- requires p7zip only in fedora + * Sun Mar 31 2013 Rex Dieter - 4.10.2-1 - 4.10.2