|
|
Author: caolanm
Update of /cvs/dist/rpms/agg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28987
Modified Files:
agg-2.4-depends.patch agg.spec
Added Files:
agg-2.5-pkgconfig.patch
Log Message:
Resolves: rhbz#237493 misapplied patch
agg-2.5-pkgconfig.patch:
libagg.pc.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE agg-2.5-pkgconfig.patch ---
--- 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}
agg-2.4-depends.patch:
font_freetype/Makefile.am | 3 ++-
src/platform/X11/Makefile.am | 2 +-
src/platform/sdl/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
Index: agg-2.4-depends.patch
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg-2.4-depends.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- agg-2.4-depends.patch 6 Jan 2007 16:31:21 -0000 1.2
+++ agg-2.4-depends.patch 23 Apr 2007 15:39:12 -0000 1.3
@@ -26,6 +26,7 @@
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@
Index: agg.spec
===================================================================
RCS file: /cvs/dist/rpms/agg/devel/agg.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- agg.spec 6 Jan 2007 16:19:28 -0000 1.15
+++ agg.spec 23 Apr 2007 15:39:12 -0000 1.16
@@ -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 @@
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 @@
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 @@
%{_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@xxxxxxxxxx> - 2.5-2
+- Resolves: rhbz#237493 misapplied patch
+
* Sat Jan 06 2007 Caolan McNamara <caolanm@xxxxxxxxxx> - 2.5-1
- bump to 2.5
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|