diff --git a/libraw-gcc47.patch b/libraw-gcc47.patch deleted file mode 100644 index fdafcc4..0000000 --- a/libraw-gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: LibRaw-0.13.5/samples/dcraw_emu.cpp -=================================================================== ---- LibRaw-0.13.5.orig/samples/dcraw_emu.cpp -+++ LibRaw-0.13.5/samples/dcraw_emu.cpp -@@ -27,6 +27,7 @@ it under the terms of the one of three l - #endif - - #include -+#include // For getpagesize, read and close - #include - #include - #include diff --git a/libraw.changes b/libraw.changes index 0cf9068..a1b2585 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 12 10:22:06 UTC 2013 - pgajdos@suse.com + +- remove libraw-gcc27.patch, it is upstreamed yet + ------------------------------------------------------------------- Tue Jun 11 12:47:51 UTC 2013 - jengelh@inai.de diff --git a/libraw.spec b/libraw.spec index f5e3064..035876a 100644 --- a/libraw.spec +++ b/libraw.spec @@ -30,8 +30,6 @@ Url: http://www.libraw.org/ #Freecode-URL: http://freecode.com/projects/libraw #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM libraw-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7. -Patch1: libraw-gcc47.patch Patch2: 0001-build-fix-return-of-random-data.patch BuildRequires: fdupes BuildRequires: gcc-c++ @@ -99,7 +97,7 @@ against LibRaw. LibRaw does not provide dynamic libraries. %prep %setup -q -n %{tar_name}-%{version} -%patch -P 1 -P 2 -p1 +%patch2 -p1 %build CXXFLAGS="%{optflags} -fPIC" \