From 760a0229087e35cc5f5779ba80041c1f21cf7868 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Date: Fri, 9 Dec 2011 19:11:07 +0530
Subject: [PATCH] Add demosaic packs (bz #760638)

Change license to GPLv3+ due to above change
---
 .gitignore  |  2 ++
 LibRaw.spec | 14 ++++++++++----
 sources     |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3bce5e6..bf0c5e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 LibRaw-0.9.1.tar.gz
 /LibRaw-0.11.3.tar.gz
 /LibRaw-0.14.3.tar.gz
+/LibRaw-demosaic-pack-GPL2-0.14.3.tar.gz
+/LibRaw-demosaic-pack-GPL3-0.14.3.tar.gz
diff --git a/LibRaw.spec b/LibRaw.spec
index a843811..d067b38 100644
--- a/LibRaw.spec
+++ b/LibRaw.spec
@@ -2,8 +2,8 @@
 Summary: Library for reading RAW files obtained from digital photo cameras
 Name: LibRaw
 Version: 0.14.3
-Release: 1%{?dist}
-License: LGPLv2 or CDDL
+Release: 2%{?dist}
+License: GPLv3+
 Group: Development/Libraries
 URL: http://www.libraw.org
 
@@ -12,6 +12,8 @@ BuildRequires: jasper-devel
 
 
 Source0: http://www.libraw.org/data/%{name}-%{version}.tar.gz
+Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz
+Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz
 
 %description
 LibRaw is a library for reading RAW files obtained from digital photo
@@ -39,11 +41,11 @@ Group: Development/Libraries
 LibRaw static development libraries.
 
 %prep
-%setup -q
+%setup -q -a1 -a2
 
 %build
 # This is not the autotools generated configure script
-%configure --enable-examples=no --enable-jasper --enable-lcms
+%configure --enable-examples=no --enable-jasper --enable-lcms --enable-demosaic-pack-gpl2 --enable-demosaic-pack-gpl3
 make %{?_smp_mflags}
 
 %install
@@ -78,6 +80,10 @@ make install DESTDIR=%{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Dec  9 2011 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> - 0.14.3-2
+- Add demosaic packs (bz #760638)
+- Change license to GPLv3+ due to above change
+
 * Wed Nov 16 2011 Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com> - 0.14.3-1
 - Rebase to upstream 0.14.3
 
diff --git a/sources b/sources
index 0db180b..5de4047 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 d8f81a52b0fada9d5bf7e659e21e3a57  LibRaw-0.14.3.tar.gz
+aca656c5d7102635dac754c7ebd81327  LibRaw-demosaic-pack-GPL2-0.14.3.tar.gz
+cb0bfecdd179449a9b7a420ce33c400b  LibRaw-demosaic-pack-GPL3-0.14.3.tar.gz