rpms/fotoxx/devel fotoxx-dynamically-link.patch, NONE, 1.1 fotoxx.spec, 1.16, 1.17

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	fotoxx.spec 
Added Files:
	fotoxx-dynamically-link.patch 
Log Message:
dynamically link to libfreeimage


fotoxx-dynamically-link.patch:

--- NEW FILE fotoxx-dynamically-link.patch ---
--- fotoxx/Makefile.BAD	2009-02-25 10:46:07.000000000 -0600
+++ fotoxx/Makefile	2009-02-25 10:46:24.000000000 -0600
@@ -20,7 +20,7 @@
 
 
 $(PROGRAM): $(PROGRAM).o zfuncs.o
-	@g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o libfreeimage.a
+	@g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -l freeimage
 
 $(PROGRAM).o: $(SOURCE) zfuncs.h
 	@g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/devel/fotoxx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fotoxx.spec	25 Feb 2009 15:29:34 -0000	1.16
+++ fotoxx.spec	25 Feb 2009 16:59:57 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		fotoxx
 Version:		6.0
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Photo editor
 
 Group:		Applications/Multimedia
@@ -12,10 +12,12 @@
 
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
+BuildRequires:  freeimage-devel
 Requires:		exiv2
 Requires:		printoxx
 
 Patch0:		fotoxx-5.8.constchar.patch
+Patch1:         fotoxx-dynamically-link.patch
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -24,8 +26,9 @@
 
 %prep
 %setup -q -n %{name}
-
+rm libfreeimage.a
 %patch0 -p1 -b .constchar
+%patch1 -p1 -b .dynamic
 
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
@@ -61,6 +64,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Feb 25 2009 Dennis Gilmore <dennis at ausil.us> - 6.0-3
+- add patch to dynamically link to libfreeimage
+
 * Wed Feb 25 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 6.0-2
 - Forgot patch