From 0b6e97dd2cd94fb5be6e96f527ce01c6db76d07c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Feb 25 2009 16:59:57 +0000 Subject: dynamically link to libfreeimage --- diff --git a/fotoxx-dynamically-link.patch b/fotoxx-dynamically-link.patch new file mode 100644 index 0000000..5256d71 --- /dev/null +++ b/fotoxx-dynamically-link.patch @@ -0,0 +1,11 @@ +--- 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) \ diff --git a/fotoxx.spec b/fotoxx.spec index de54329..9b44f84 100644 --- a/fotoxx.spec +++ b/fotoxx.spec @@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 @@ needs while remaining easy to use. %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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/%{name}.png %changelog +* Wed Feb 25 2009 Dennis Gilmore - 6.0-3 +- add patch to dynamically link to libfreeimage + * Wed Feb 25 2009 Pavel Alexeev - 6.0-2 - Forgot patch