[libkdcraw] apply external LibRaw patch only for F20+

nucleo nucleo at fedoraproject.org
Sat Jul 13 20:09:17 UTC 2013


commit 8c67a055c2a030ce35eceb0d99e1ed6095f6144a
Author: nucleo <nucleo at fedoraproject.org>
Date:   Sat Jul 13 23:08:45 2013 +0300

    apply external LibRaw patch only for F20+
    
    - remove bundled LibRaw for F20+

 libkdcraw.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/libkdcraw.spec b/libkdcraw.spec
index 83c0a17..654e439 100644
--- a/libkdcraw.spec
+++ b/libkdcraw.spec
@@ -1,7 +1,7 @@
 Name:    libkdcraw
 Summary: A C++ interface around LibRaw library
 Version: 4.10.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # libkdcraw is GPLv2+,
 # LibRaw(bundled) is LGPLv2
@@ -69,14 +69,16 @@ Requires: kdelibs4-devel
 %prep
 %setup -q
 %patch50 -p1 -b .libjpeg-turbo
+
 %if 0%{?fedora} > 19
 %patch100 -p1 -b .external-libraw
-%endif
-
+# remove bundled LibRaw
+rm -rf libraw
+%else
 # copy/rename a few things for easier inclusion as %%doc
 cp -a libraw/README README.libraw
 cp -a libraw/COPYRIGHT COPYRIGHT.libraw
-
+%endif
 
 %build
 mkdir -p %{_target_platform}
@@ -131,6 +133,10 @@ fi
 
 
 %changelog
+* Sat Jul 13 2013 Alexey Kurov <nucleo at fedoraproject.org> - 4.10.90-4
+- apply external LibRaw patch only for F20+
+- remove bundled LibRaw for F20+
+
 * Mon Jul  8 2013 Alexey Kurov <nucleo at fedoraproject.org> - 4.10.90-3
 - build against external LibRaw kde#307146
 


More information about the scm-commits mailing list