SPECS (AC-branch): gd.spec - updated rotate_from_php patch with co...

[glen]

Author: glen                         Date: Thu Dec 28 13:00:33 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated rotate_from_php patch with code from php 5.2.0
  (incompatible with older php!)
- gd(imagerotate) cap versioned with php version
- release 10

---- Files affected:
SPECS:
   gd.spec (1.115.2.1 -> 1.115.2.2) 

---- Diffs:

================================================================
Index: SPECS/gd.spec
diff -u SPECS/gd.spec:1.115.2.1 SPECS/gd.spec:1.115.2.2
--- SPECS/gd.spec:1.115.2.1	Fri Mar 10 09:46:58 2006
+++ SPECS/gd.spec	Thu Dec 28 14:00:25 2006
@@ -10,16 +10,16 @@
 Summary(pt_BR):	Biblioteca para manipulaçăo de imagens
 Name:		gd
 Version:	2.0.33
-Release:	6
+Release:	10
 License:	BSD-like
 Group:		Libraries
 Source0:	http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz
 # Source0-md5:	be0a6d326cd8567e736fbc75df0a5c45
 Patch0:		%{name}-fontpath.patch
-Patch1:		%{name}-rotate_from_php.patch
+Patch1:		%{name}-SetAAPixel.patch
 Patch2:		%{name}-graphviz.patch
-Patch3:		%{name}-SetAAPixel.patch
-Patch4:		%{name}-security.patch
+Patch3:		%{name}-security.patch
+Patch4:		%{name}-rotate_from_php.patch
 URL:		http://www.boutell.com/gd/
 %{?with_xpm:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
@@ -27,12 +27,14 @@
 %{?with_fontconfig:BuildRequires:	fontconfig-devel}
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-devel
-BuildRequires:	libpng-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.3
 BuildRequires:	zlib-devel
 Provides:	gd(gif) = %{version}-%{release}
+# versioned by php version rotate_from_php code comes from
+Provides:	gd(imagerotate) = 5.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -82,6 +84,7 @@
 Requires:	libpng-devel
 Requires:	zlib-devel
 Provides:	gd-devel(gif) = %{version}-%{release}
+Provides:	gd-devel(imagerotate) = 5.2.0
 
 %description devel
 This package contains the files needed for development of programs
@@ -106,6 +109,7 @@
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Provides:	gd-static(gif) = %{version}-%{release}
+Provides:	gd-static(imagerotate) = 5.2.0
 
 %description static
 This package contains static gd library.
@@ -147,8 +151,8 @@
 %patch3 -p1
 %patch4 -p1
 
-# hack to avoid inclusion of -s or -L/usr/%{_lib} in --ldflags
-%{__perl} -pi -e 's,\@LDFLAGS\@,-L/usr/X11R6/%{_lib},g' config/gdlib-config.in
+# hack to avoid inclusion of -s in --ldflags
+%{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
 
 %build
 %{__libtoolize}
@@ -176,18 +180,18 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING index.html
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/libgd.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gdlib-config
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libgd.so
+%{_libdir}/libgd.la
+%{_includedir}/*.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgd.a
 
 %files progs
 %defattr(644,root,root,755)
@@ -200,6 +204,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115.2.2  2006/12/28 13:00:25  glen
+- updated rotate_from_php patch with code from php 5.2.0
+  (incompatible with older php!)
+- gd(imagerotate) cap versioned with php version
+- release 10
+
 Revision 1.115.2.1  2006/03/10 08:46:58  qboosh
 - merged SetAAPixel,security patches from HEAD; release 6, STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gd.spec?r1=1.115.2.1&r2=1.115.2.2&f=u