rpms/gpscorrelate/devel gpscorrelate-1.6.0-stdc++.patch, 1.1, 1.2 gpscorrelate.spec, 1.4, 1.5

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/gpscorrelate/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12815

Modified Files:
	gpscorrelate-1.6.0-stdc++.patch gpscorrelate.spec 
Log Message:
* Wed Feb 10 2010 Till Maas <opensource at till.name> - 1.6.0-6
- Fix DSOLinkChange breakage using g++ to link instead of adding -lstdc++.
  Thanks Ralf Corsepius for spotting this:
  http://lists.fedoraproject.org/pipermail/devel/2010-February/130631.html


gpscorrelate-1.6.0-stdc++.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: gpscorrelate-1.6.0-stdc++.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/devel/gpscorrelate-1.6.0-stdc++.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpscorrelate-1.6.0-stdc++.patch	10 Feb 2010 16:59:51 -0000	1.1
+++ gpscorrelate-1.6.0-stdc++.patch	10 Feb 2010 17:22:25 -0000	1.2
@@ -1,12 +1,17 @@
 diff -up gpscorrelate-1.6.0/Makefile.stdc++ gpscorrelate-1.6.0/Makefile
---- gpscorrelate-1.6.0/Makefile.stdc++	2010-02-10 17:48:00.316933435 +0100
-+++ gpscorrelate-1.6.0/Makefile	2010-02-10 17:48:05.044936249 +0100
-@@ -7,7 +7,7 @@ GOBJS    = main-gui.o gui.o unixtime.o g
- CFLAGS   = -Wall
- override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
- OFLAGS   = -Wall
--override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
-+override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2 -lstdc++
- prefix   = /usr/local
- bindir   = $(prefix)/bin
- datadir  = $(prefix)/share
+diff -up gpscorrelate-1.6.0/Makefile.stdc++ gpscorrelate-1.6.0/Makefile
+--- gpscorrelate-1.6.0/Makefile.stdc++	2010-02-10 18:14:51.924089045 +0100
++++ gpscorrelate-1.6.0/Makefile	2010-02-10 18:17:17.826968409 +0100
+@@ -18,10 +18,10 @@ applicationsdir = $(datadir)/application
+ all:	gpscorrelate gpscorrelate-gui gpscorrelate.1
+ 
+ gpscorrelate: $(COBJS)
+-	gcc $(OFLAGS) -o $@ $(COBJS)
++	g++ $(OFLAGS) -o $@ $(COBJS)
+ 
+ gpscorrelate-gui: $(GOBJS)
+-	gcc $(OFLAGS) -o $@ $(GOBJS)
++	g++ $(OFLAGS) -o $@ $(GOBJS)
+ 
+ .c.o:
+ 	gcc $(CFLAGS) -c -o $*.o $<


Index: gpscorrelate.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpscorrelate/devel/gpscorrelate.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gpscorrelate.spec	10 Feb 2010 16:59:52 -0000	1.4
+++ gpscorrelate.spec	10 Feb 2010 17:22:25 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           gpscorrelate
 Version:        1.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A GPS photo correlation / geotagging tool
 
 Group:          Applications/Productivity 
@@ -79,6 +79,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Feb 10 2010 Till Maas <opensource at till.name> - 1.6.0-6
+- Fix DSOLinkChange breakage using g++ to link instead of adding -lstdc++.
+  Thanks Ralf Corsepius for spotting this:
+  http://lists.fedoraproject.org/pipermail/devel/2010-February/130631.html
+
 * Wed Feb 10 2010 Till Maas <opensource at till.name> - 1.6.0-5
 - Fix build failure due to https://fedoraproject.org/wiki/UnderstandingDSOLinkChange