[rpms/opencv] opencv5: clean sources

[rpms/opencv] opencv5: clean sources

[Tom Callaway]

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 8dbdc4956d23367e9eb6f306def54c68b4bbe249
Author : Tom Callaway <spot@fedoraproject.org>
Date   : 2013-04-02T14:34:28-04:00
Stats  : +11/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/8dbdc4956d23367e9eb6f306def54c68b4bbe249?branch=opencv5

Log:
clean sources

---
diff --git a/.gitignore b/.gitignore
index 242093e..499ca9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ OpenCV-2.1.0.tar.bz2
 /OpenCV-2.4.3.tar.bz2
 /OpenCV-2.4.4-beta.tar.bz2
 /OpenCV-2.4.4a.tar.bz2
+/OpenCV-2.4.4a-clean.tar.bz2

diff --git a/opencv.spec b/opencv.spec
index 229d1dd..156a71c 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -5,14 +5,18 @@
 
 Name:           opencv
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
 # This is normal three clause BSD.
 License:        BSD
 URL:            http://opencv.willowgarage.com/wiki/
-Source0:        http://downloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}%{?indice}.tar.bz2
+# Need to remove SIFT/SURF from source tarball, due to legal concerns
+# rm -rf opencv-2.4.4/modules/nonfree/src/sift.cpp 
+# rm -rf opencv-2.4.4/modules/nonfree/src/surf.cpp
+# Source0:        http://downloads.sourceforge.net/opencvlibrary/%{tar_name}-%{version}%{?indice}.tar.bz2
+Source0:	%{tar_name}-%{version}%{?indice}-clean.tar.bz2
 Source1:        opencv-samples-Makefile
 Patch0:         opencv-pkgcmake.patch
 Patch1:         opencv-pkgcmake2.patch
@@ -232,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr  2 2013 Tom Callaway <spot@fedoraproject.org> - 2.4.4-2
+- make clean source without SIFT/SURF
+
 * Sat Mar 23 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.4.4-1
 - Update to 2.4.4a
 - Fix ttb-devel architecture conditionals

diff --git a/sources b/sources
index a07a69e..643e409 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-876dce80ea2648b7e4d4c5a567b4d37b  OpenCV-2.4.4a.tar.bz2
+0f69345a993adc8236eff875a29e1445  OpenCV-2.4.4a-clean.tar.bz2