From f804c9b321d00811cf9bbc34dab410268ca8dcf1 Mon Sep 17 00:00:00 2001
From: Haïkel Guémar <hguemar@fedoraproject.org>
Date: Jan 12 2010 15:41:43 +0000
Subject: backport spec fixes and updated opencv-samples-Makefile from devel branch


---

diff --git a/opencv-samples-Makefile b/opencv-samples-Makefile
index 6c69149..bd4dc6d 100644
--- a/opencv-samples-Makefile
+++ b/opencv-samples-Makefile
@@ -1,4 +1,10 @@
 CFLAGS := `pkg-config --cflags opencv` $(CFLAGS)
+CXXFLAGS := `pkg-config --cflags opencv` $(CXXFLAGS)
 LDFLAGS := `pkg-config --libs opencv` $(LDFLAGS)
 
-all: $(patsubst %.c,%,$(wildcard *.c))
+PROGRAMS := $(patsubst %.c,%,$(wildcard *.c)) $(patsubst %.cpp,%,$(wildcard *.cpp))
+
+.PHONY: all clean
+all: $(PROGRAMS)
+clean:
+	rm -f $(PROGRAMS)
diff --git a/opencv.spec b/opencv.spec
index e47153e..9799c71 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -3,7 +3,7 @@
 
 Name:           opencv
 Version:        1.1.0
-Release:        0.7.pre1%{?dist}
+Release:        0.8.pre1%{?dist}
 Summary:        Collection of algorithms for computer vision
 
 Group:          Development/Libraries
@@ -158,12 +158,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files python
+%defattr(-,root,root,-)
 %{python_sitearch}/opencv
 %doc %dir %{_datadir}/opencv/samples
 %doc %{_datadir}/opencv/samples/python
 
 
 %changelog
+* Tue Jan 12 2010 Haïkel Guémar <karlthered@gmail.com> 1.1.0-0.8.pre1
+- backport rpmlint spec issues fixes
+- backport updated opencv-samples-Makefile (Thanks Scott Tsai) #553697
+
 * Thu Sep 10 2009 Karsten Hopp <karsten@redhat.com> 1.1.0-0.7.pre1
 - fix build on s390x where we don't have libraw1394 and devel