From 75bfc54ef892d1031858437b26754bcf456afca2 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Apr 22 2011 08:15:05 +0000 Subject: Revert "don't use x86-only compiler flags on non-x86 arches" This reverts commit 8182cee052087a4b33cabdaebcc71cf358e292ae. --- diff --git a/darktable-0.8-flags.patch b/darktable-0.8-flags.patch deleted file mode 100644 index a81b76d..0000000 --- a/darktable-0.8-flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up darktable-0.8/src/CMakeLists.txt.flags darktable-0.8/src/CMakeLists.txt ---- darktable-0.8/src/CMakeLists.txt.flags 2011-04-22 08:21:41.000000000 +0200 -+++ darktable-0.8/src/CMakeLists.txt 2011-04-22 08:22:03.000000000 +0200 -@@ -208,10 +208,10 @@ if(NOT WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") - endif(NOT WIN32) - --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse -march=native -g") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG") --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse -march=native -g") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG") - diff --git a/darktable.spec b/darktable.spec index eefc102..4edd50c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -3,7 +3,7 @@ Name: darktable Version: 0.8 -Release: 9%{?dist} +Release: 8%{?dist} Summary: Utility to organize and develop raw images Group: Applications/Multimedia @@ -13,7 +13,6 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: darktable-0.8-unused_variables.patch Patch1: darktable-0.8-clean_up_set_but_unused_variables.patch Patch2: darktable-0.8-Remove-the-RELATIVE_PATH_FROM_BIN-variable.patch -Patch3: darktable-0.8-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -52,9 +51,7 @@ It also enables you to develop raw images and enhance them. %patch0 -p1 -b unused_variables.rej %patch1 -p1 -b clean_up_set_but_unused_variables.rej %patch2 -p1 -b Remove-the-RELATIVE_PATH_FROM_BIN-variable.rej -%ifnarch %{ix86} x86_64 -%patch3 -p1 -b .flags -%endif + %build mkdir buildFedora @@ -122,9 +119,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Fri Apr 22 2011 Dan Horák - 0.8-9 -- don't use x86-only compiler flags on non-x86 arches - * Tue Apr 19 2011 Edouard Bourguignon - 0.8-8 - Change build option