SPECS (AC-branch): gd.spec - reverted previous commit, breaks php4...

[hawk]

Author: hawk                         Date: Sun Dec 31 18:01:58 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- reverted previous commit, breaks php4.spec, release 11

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

---- Diffs:

================================================================
Index: SPECS/gd.spec
diff -u SPECS/gd.spec:1.115.2.2 SPECS/gd.spec:1.115.2.3
--- SPECS/gd.spec:1.115.2.2	Thu Dec 28 14:00:25 2006
+++ SPECS/gd.spec	Sun Dec 31 19:01:53 2006
@@ -10,16 +10,16 @@
 Summary(pt_BR):	Biblioteca para manipulaçăo de imagens
 Name:		gd
 Version:	2.0.33
-Release:	10
+Release:	11
 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}-SetAAPixel.patch
+Patch1:		%{name}-rotate_from_php.patch
 Patch2:		%{name}-graphviz.patch
-Patch3:		%{name}-security.patch
-Patch4:		%{name}-rotate_from_php.patch
+Patch3:		%{name}-SetAAPixel.patch
+Patch4:		%{name}-security.patch
 URL:		http://www.boutell.com/gd/
 %{?with_xpm:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
@@ -27,14 +27,12 @@
 %{?with_fontconfig:BuildRequires:	fontconfig-devel}
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	gettext-devel
-BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libjpeg-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
@@ -84,7 +82,6 @@
 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
@@ -109,7 +106,6 @@
 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.
@@ -151,8 +147,8 @@
 %patch3 -p1
 %patch4 -p1
 
-# hack to avoid inclusion of -s in --ldflags
-%{__perl} -pi -e 's,\@LDFLAGS\@,,g' config/gdlib-config.in
+# 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
 
 %build
 %{__libtoolize}
@@ -180,18 +176,18 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING index.html
-%attr(755,root,root) %{_libdir}/libgd.so.*.*.*
+%attr(755,root,root) %{_libdir}/*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gdlib-config
-%attr(755,root,root) %{_libdir}/libgd.so
-%{_libdir}/libgd.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/*.so
+%{_libdir}/*.la
+%{_includedir}/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgd.a
+%{_libdir}/lib*.a
 
 %files progs
 %defattr(644,root,root,755)
@@ -204,6 +200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115.2.3  2006/12/31 18:01:53  hawk
+- reverted previous commit, breaks php4.spec, release 11
+
 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!)
================================================================

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