merge conflicts

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=18
This commit is contained in:
Dirk Mueller 2010-09-12 21:39:26 +00:00 committed by Git OBS Bridge
parent 9f6cd35074
commit 04a5035312

11
mc.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package mc (Version 4.6.2)
# spec file for package mc (Version 4.7.0.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -24,7 +24,7 @@ Group: Productivity/File utilities
License: GPLv2+
Url: http://www.ibiblio.org/mc/
Version: 4.7.0.7
Release: 7
Release: 1
Source: mc-%{version}.tar.lzma
Source1: x11_browser
Source2: %{name}.desktop
@ -48,10 +48,9 @@ Patch32: 20_wrong_path_to_wrappers.patch
# PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation.
Patch41: mc-multi-press-f-keys.patch
# Patches from Fedora
Patch50: mc-extensions.patch
Patch51: mc-mcviewsegfault.patch
Patch52: mc-int_ptr_casts.patch
Patch50: mc-extensions.patch
Patch51: mc-mcviewsegfault.patch
Patch52: mc-int_ptr_casts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: audiofile-devel
BuildRequires: docbook-toys