From 018b46e6e787953a2c471aa15c06355d75f738ca Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Apr 23 2007 15:39:12 +0000
Subject: Resolves: rhbz#237493 misapplied patch


---

diff --git a/agg-2.4-depends.patch b/agg-2.4-depends.patch
index 3648877..e9b2a22 100644
--- a/agg-2.4-depends.patch
+++ b/agg-2.4-depends.patch
@@ -26,6 +26,7 @@ diff -ru agg-2.4.orig/src/platform/sdl/Makefile.am agg-2.4/src/platform/sdl/Make
 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 -I@x_includes@
diff --git a/agg-2.5-pkgconfig.patch b/agg-2.5-pkgconfig.patch
new file mode 100644
index 0000000..a303bfb
--- /dev/null
+++ b/agg-2.5-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- agg-2.5/libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
++++ agg-2.5/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Requires.private: freetype2
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
diff --git a/agg.spec b/agg.spec
index 910a7dd..49ecf67 100644
--- a/agg.spec
+++ b/agg.spec
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry
 Name:    agg
 Version: 2.5
-Release: 1
+Release: 2%{?dist}
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: GPL
@@ -10,9 +10,10 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: automake, libtool, libX11-devel, freetype-devel, SDL-devel
 
 Patch0: agg-2.4-depends.patch
+Patch1: agg-2.5-pkgconfig.patch
 
 %description
-A High Quality Rendering Engine for C++
+A High Quality Rendering Engine for C++.
 
 %package devel
 Summary: Support files necessary to compile applications with agg
@@ -20,26 +21,25 @@ Group: Development/Libraries
 Requires: agg = %{version}-%{release}
 
 %description devel
-Libraries, headers, and support files necessary to compile applications using agg
+Libraries, headers, and support files necessary to compile applications using agg.
 
 %prep
 %setup -q
 %patch0 -p1 -b .agg-2.4-depends
+%patch1 -p1 -b .agg-2.5-pkgconfig.patch
+sh ./autogen.sh
 
 %build
-sh ./autogen.sh --disable-gpc
-%configure
-make
+%configure --disable-static --disable-gpc
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun 
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -47,16 +47,18 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_libdir}/lib*.so.*
 
 %files devel
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libagg.pc
-%{_includedir}/agg2
+%{_includedir}/agg2/
 %{_datadir}/aclocal/libagg.m4
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 23 2007 Caolan McNamara <caolanm@redhat.com> - 2.5-2
+- Resolves: rhbz#237493 misapplied patch
+
 * Sat Jan 06 2007 Caolan McNamara <caolanm@redhat.com> - 2.5-1
 - bump to 2.5