diff --git a/agg-2.4-depends.patch b/agg-2.4-depends.patch new file mode 100644 index 0000000..1604936 --- /dev/null +++ b/agg-2.4-depends.patch @@ -0,0 +1,35 @@ +diff -ru agg-2.4.orig/font_freetype/Makefile.am agg-2.4/font_freetype/Makefile.am +--- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 ++++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -4,8 +4,9 @@ + agginclude_HEADERS = agg_font_freetype.h + lib_LTLIBRARIES = libaggfontfreetype.la + +-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ ++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ + libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp + libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ ++libaggfontfreetype_la_LIBADD = ../src/libagg.la + endif + +diff -ru agg-2.4.orig/src/platform/sdl/Makefile.am agg-2.4/src/platform/sdl/Makefile.am +--- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 ++++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -5,6 +5,6 @@ + libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggplatformsdl_la_SOURCES = agg_platform_support.cpp + libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ +-libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ++libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ../../libagg.la + endif + +diff -ru agg-2.4.orig/src/platform/X11/Makefile.am agg-2.4/src/platform/X11/Makefile.am +--- agg-2.4.orig/src/platform/X11/Makefile.am 2005-10-19 19:11:35.000000000 +0100 ++++ agg-2.4/src/platform/X11/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -4,5 +4,5 @@ + libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ + libaggplatformX11_la_SOURCES = agg_platform_support.cpp + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include @x_includes@ +-libaggplatformX11_la_LIBADD = -lX11 ++libaggplatformX11_la_LIBADD = -lX11 ../../libagg.la + endif diff --git a/agg.spec b/agg.spec index db2b258..ffb9ece 100644 --- a/agg.spec +++ b/agg.spec @@ -1,7 +1,7 @@ Summary: Anti-Grain Geometry Name: agg Version: 2.4 -Release: 1 +Release: 2 Group: System Environment/Libraries URL: http://www.antigrain.com License: MIT @@ -9,6 +9,8 @@ Source: http://www.antigrain.com/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel +Patch0: agg-2.4-depends.patch + %description A High Quality Rendering Engine for C++ @@ -22,6 +24,7 @@ Libraries, headers, and support files necessary to compile applications using ag %prep %setup -q +%patch0 -p1 -b .agg-2.4-depends %build sh ./autogen.sh --disable-gpc @@ -54,6 +57,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -r $RPM_BUILD_ROOT %changelog +* Mon Jul 10 2006 Caolan McNamara - 2.4-2 +- rh#198174# add extra links from libs to their runtime requirements + * Wed May 10 2006 Caolan McNamara - 2.4-1 - next version