- release 3, built against libpng >= 1.0.8

[packages/imlib.git] / imlib.spec

diff --git a/imlib.spec b/imlib.spec
index c15e775bcff536d1cc39631fe9dff9a69f89e1e2..a63d767aa6edb37a2469ff32ac665084020e6c93 100644 (file)
--- a/imlib.spec
+++ b/imlib.spec
@@ -2,38 +2,36 @@ Summary:      Image loading and rendering library for X11R6
 Summary(fr):   Librairie de chargement et interprétation d'images pour X11R6
 Summary(pl):   Biblioteki do renderowania i ³adowania grafiki pod X11R6
 Name:          imlib
-Version:       1.9.8
-Release:       3
+Version:       1.9.8.1
+Release: 3
 License:       LGPL
 Group:         X11/Libraries
 Group(pl):     X11/Biblioteki
 Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/sources/imlib/%{name}-%{version}.tar.gz
 Source1:       imlib-config.desktop
-Patch:         imlib-gdk.patch
+Patch0:                imlib-gdk.patch
 URL:           http://www.labs.redhat.com/imlib/
-BuildRequires: glib-devel 
 BuildRequires: gtk+-devel 
-BuildRequires: XFree86-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng >= 1.0.8
 BuildRequires: libungif-devel
 BuildRequires: zlib-devel
-BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _datadir        /usr/share
 %define                _sysconfdir     /etc/X11
-%define                _applnkdir      %{_prefix}/share/applnk
 
 %description
-Imlib is an advanced replacement library for libraries like libXpm that
-provides many more features with much greater flexability and speed.
+Imlib is an advanced replacement library for libraries like libXpm
+that provides many more features with much greater flexability and
+speed.
 
 %description -l fr
-Imlib est une librairie de remplacement avancée pour les librairies comme
-libXpm qui fourni plus d'atouts et beaucoup plus de flexibilité et de
-vitesse.
+Imlib est une librairie de remplacement avancée pour les librairies
+comme libXpm qui fourni plus d'atouts et beaucoup plus de flexibilité
+et de vitesse.
 
 %description -l pl
 Imlib jest zaawansowanym zamiennikiem bibliotek typu libXpm.
@@ -46,13 +44,14 @@ Group(pl):  X11/Narz
 Requires:      %{name} = %{version}
 
 %description cfgeditor
-The imlib_config program allows you to control the way imlib uses color and
-handles gamma correction/etc.
+The imlib_config program allows you to control the way imlib uses
+color and handles gamma correction/etc.
 
 %description -l pl cfgeditor
-Program imlib_config umo¿liwia zmianê sposobu u¿ywania przez bibliotekê
-imlib kolorów, korekcji gamma i innych.  The imlib_config program allows
-you to control the way imlib uses color and handles gamma correction/etc.
+Program imlib_config umo¿liwia zmianê sposobu u¿ywania przez
+bibliotekê imlib kolorów, korekcji gamma i innych. The imlib_config
+program allows you to control the way imlib uses color and handles
+gamma correction/etc.
 
 %package devel
 Summary:       Imlib header files and development documentation
@@ -61,6 +60,15 @@ Summary(pl): Pliki nag
 Group:         X11/Development/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name} = %{version}
+# Every program using imlib should get a list of libraries to link with by
+# executing `imlib-config --libs`. All libraries listed below are returned by
+# this call, so they are required by every program compiled with imlib.
+Requires:      libjpeg-devel
+Requires:      libtiff-devel
+Requires:      libungif-devel
+Requires:      libpng-devel
+Requires:      zlib-devel
+Requires:      XFree86-devel
 
 %description devel
 Header files and development documentation for Imlib.
@@ -93,13 +101,15 @@ automake
 LDFLAGS="-s"; export LDFLAGS
 %configure
 
-make
+%{__make}
                            
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       m4datadir=%{_aclocaldir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Settings
 
@@ -136,9 +146,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/imlib-config
 
 %{_includedir}/*
-%{_datadir}/aclocal/*
+%{_aclocaldir}/*
 
 %files static
 %defattr(644,root,root,755)
-
 %{_libdir}/lib*.a