From 04a50353128dde91b5dbd3366abb94a0cb5380c3e7d08a63074d91445f2b26e5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 12 Sep 2010 21:39:26 +0000
Subject: [PATCH] merge conflicts

OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=18
---
 mc.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mc.spec b/mc.spec
index 892d77d..6e46679 100644
--- a/mc.spec
+++ b/mc.spec
@@ -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