- updated am patch to work with current auto*, added libpng 1.2.2 support

[packages/XmHTML.git] / XmHTML.spec

diff --git a/XmHTML.spec b/XmHTML.spec
index cea77cd97dbeb9677e3b2fba689fbd75b258ec7c..380905f9a60cbba3884c8f90cb2297daf9f15260 100644 (file)
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -2,22 +2,20 @@ Summary:      Motif HTML widget
 Summary(pl):   Widget do HTML oparty o Motif
 Name:          XmHTML
 Version:       1.1.7
-Release:       1
+Release:       2
 License:       LGPL
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(pl):     X11/Biblioteki
 Source0:       http://www.xs4all.nl/~ripley/XmHTML/dist/%{name}-%{version}.tar.gz
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-macro.patch
 URL:           http://www.xs4all.nl/~ripley/XmHTML/
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: lesstif-devel
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: lesstif-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -34,23 +32,19 @@ XmHTML zawiera widget wy
 Summary:       Development package of XmHTML
 Summary(pl):   Pliki nag³ówkowe XmHTML
 Group:         X11/Development/Libraries
-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name} = %{version}
 
 %description devel
 Headers needed to compile XmHTML programs.
 
 %description devel -l pl
-Pliki nag³ówkowe potrzebne do kompilowania programów korzystaj±cych
-z XmHTML.
+Pliki nag³ówkowe potrzebne do kompilowania programów korzystaj±cych z
+XmHTML.
 
 %package static
 Summary:       Static version of XmHTML library
 Summary(pl):   Statyczna biblioteka XmHTML
 Group:         X11/Development/Libraries
-Group(de):     X11/Entwicklung/Libraries
-Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -76,11 +70,11 @@ mv -f Motif/*.c .
 libtoolize --copy --force
 aclocal
 autoconf
-automake -a -c
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} \
-       -I`pwd`/include/XmHTML -I`pwd`/include/common"
+automake -a -c -f
+CFLAGS="%{rpmcflags} \
+       -I`pwd`/include/XmHTML -I`pwd`/include/common \
        %{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
-%configure
+%configure PNGINC="`pkg-config --cflags libpng12 2>/dev/null`"
 
 cd lib
 %{__make}