rpms/opencv/F-12 opencv-samples-Makefile, 1.1, 1.2 opencv.spec, 1.37, 1.38

[Haïkel Guémar]

Author: hguemar

Update of /cvs/pkgs/rpms/opencv/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11640

Modified Files:
	opencv-samples-Makefile opencv.spec 
Log Message:
backport spec fixes and updated opencv-samples-Makefile from devel branch


Index: opencv-samples-Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/F-12/opencv-samples-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- opencv-samples-Makefile	5 Mar 2006 19:45:57 -0000	1.1
+++ opencv-samples-Makefile	12 Jan 2010 15:41:43 -0000	1.2
@@ -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)


Index: opencv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/opencv/F-12/opencv.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- opencv.spec	10 Sep 2009 12:32:22 -0000	1.37
+++ opencv.spec	12 Jan 2010 15:41:43 -0000	1.38
@@ -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 at 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 at redhat.com> 1.1.0-0.7.pre1
 - fix build on s390x where we don't have libraw1394 and devel