-Summary: Library for GIF creation
-Name: gd
-Version: 1.3
-Release: 3
-Source: ftp://ftp.boutell.com/pub/boutell/gd/%{name}%{version}.tar.gz
-URL: http://www.boutell.com/gd/
-Patch0: gd-shared.patch
-Patch1: gd-non-root.patch
-Copyright: BSD-style
-Group: Libraries
-BuildRoot: /tmp/%{name}-%{version}-root
+Summary: Library for PNG, JPEG creation
+Summary(pl): Biblioteka do tworzenia grafiki w formacie PNG, JPEG
+Name: gd
+Version: 1.8.3
+Release: 3
+License: BSD-style
+Group: Libraries
+Group(fr): Librairies
+Group(pl): Biblioteki
+Source0: ftp://ftp.boutell.com/pub/boutell/gd/%{name}-%{version}.tar.gz
+Patch0: gd-pld-patch
+URL: http://www.boutell.com/gd/
+BuildRequires: zlib-devel
+BuildRequires: libpng >= 1.0.8
+BuildRequires: freetype-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define shlibver %(echo %{version} | cut -f-2 -d.)
%description
-This library allows you to easily create and manipulate GIF image files
-from your C programs.
+gd library creates PNG, JPEG and WBMP images, not GIF images. This is a
+good thing. PNG is a more compact format, and full compression is available.
+JPEG works well with photographic images, and is still more compatible with
+the major Web browsers than even PNG is. WBMP is intended for wireless
+devices (not regular web browsers). Existing code will need modification to
+call or gdImageJpeg instead of gdImageGif.
+
+This library allows you to easily create and manipulate PNG, JPEG image
+files from your C programs.
+
+%description -l pl
+Biblioteka pozwalaj±ca na proste tworzenie i manipulowanie plikami
+graficznymi w formacie PNG.
%package devel
-Summary: Development part of the GD library
-Group: Development/Libraries
-Requires: %{name} = %{version}
+Summary: Development part of the GD library
+Summary(pl): Czê¶æ biblioteki GD przeznaczona dla developerów
+Group: Development/Libraries
+Group(fr): Development/Librairies
+Group(pl): Programowanie/Biblioteki
+Requires: %{name} = %{version}
+
+%description devel
+This package contains the files needed for development of programs
+linked against GD.
+
+%description -l pl devel
+Pakiet ten zawiera pliki potrzebne do rozwoju programów korzystaj±cych
+z biblioteki GD.
+
+%package static
+Summary: Static GD library
+Summary(pl): Statyczna biblioteka GD
+Group: Development/Libraries
+Group(fr): Development/Librairies
+Group(pl): Programowanie/Biblioteki
+Requires: %{name} = %{version}
%description devel
-This package contains the files needed for development of programs linked
-against GD.
+This package contains static GD library.
+
+%description -l pl static
+Pakiet ten zawiera statyczn± bibliotekê GD.
%prep
-%setup -q -n %{name}%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+%patch0 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" make
+CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype"
+LDFLAGS="-s"
+export CFLAGS LDFLAGS
+%{__make} libgd.a
+gcc -shared -o libgd.so.%{version} -Wl,-soname=libgd.so.%{shlibver} \
+ `ar t libgd.a` -L/usr/X11R6/lib -lttf -ljpeg -lpng -lz -lm
%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{include,lib}
-install {gd,gdfontg,gdfontl,gdfontmb,gdfonts,gdfontt}.h $RPM_BUILD_ROOT/usr/include
-install -s libgd.so* $RPM_BUILD_ROOT/usr/lib
+
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}}
+%{__make} install \
+ INSTALL_BIN=$RPM_BUILD_ROOT%{_bindir} \
+ INSTALL_INCLUDE=$RPM_BUILD_ROOT%{_includedir} \
+ INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir}
+
+install libgd.so.%{version} $RPM_BUILD_ROOT%{_libdir}/
+ln -s libgd.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgd.so
+
+#make DESTDIR="$RPM_BUILD_ROOT" install
+
+strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
+
+gzip -9nf readme.txt index.html
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -fr $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%attr(755, root, root) /usr/lib/*.so.*
+%defattr(644,root,root,755)
+%doc readme.txt.gz
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/*.so.*.*
%files devel
-%defattr(644, root, root, 755)
-%doc readme.txt index.html
-%attr(755, root, root) /usr/lib/*.so
-/usr/include/*
-
-%changelog
-* Thu Sep 24 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
- [1.3-4]
-- added -q %setup parameter,
-- changed Buildroot to /tmp/%%{name}-%%{version}-root,
-- added using %%{name} and %%{version} in Source and %setup,
-- added %postun,
-- changeded dependences to "Requires: %%{name} = %%{version}" in devel
- subpackage,
-- added striping shared libraries,
-- added %attr and %defattr macros in %files (allow build package from
- non-root account).
-
-* Fri Sep 11 1998 Cristian Gafton <gafton@redhat.com>
-- built for 5.2
+%defattr(644,root,root,755)
+%doc index.html.gz
+%attr(755,root,root) %{_libdir}/*.so
+%{_includedir}/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a