X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XmHTML.spec;h=eaf76e0b905271bf15fcc0d90742d101ce0f36aa;hb=4b33a60d1e07db497de104b1019c31b31f103365;hp=925908fb73bd60fbe68ca6cbe0c95fa32caf9942;hpb=9523ae521490bcf5cc61ac47a86acae4a3af80f1;p=packages%2FXmHTML.git

diff --git a/XmHTML.spec b/XmHTML.spec
index 925908f..eaf76e0 100644
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -2,23 +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/
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-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
 %define		_mandir		%{_prefix}/man
@@ -34,23 +31,20 @@ 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}
+Requires:	lesstif-devel
 
 %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
@@ -73,14 +67,15 @@ mv -f common/*.c .
 mv -f Motif/*.c .
 )
 
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}"
-CFLAGS="$CFLAGS -I`pwd`/include/XmHTML -I`pwd`/include/common"
-CFLAGS="$CFLAGS -DNDEBUG -Dproduction -DVERSION=1107"
-%configure
+rm -f missing
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+CFLAGS="%{rpmcflags} \
+	-I`pwd`/include/XmHTML -I`pwd`/include/common \
+	%{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
+%configure PNGINC="`pkg-config --cflags libpng12 2>/dev/null`"
 
 cd lib
 %{__make}
@@ -89,9 +84,7 @@ cd lib
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/XmHTML
 
-(cd lib
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-)
+%{__make} install -C lib DESTDIR=$RPM_BUILD_ROOT
 
 install include/XmHTML/{Balloon,HTML,HTMLStrings,XCC,XmHTML}.h \
 	include/common/LZWStream.h \
@@ -99,10 +92,6 @@ install include/XmHTML/{Balloon,HTML,HTMLStrings,XCC,XmHTML}.h \
 
 rm -f html/man/man.{map,tmpl}
 
-gzip -9nf APPS BUG-REPORTING CHANGES DEBUGGING FEEDBACK FIXES \
-	LICENSE README THANKS TODO \
-	docs/{QUOTES,README.*,REASONS,progressive.txt}
-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,14 +100,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz docs/*.gz
+%doc APPS BUG-REPORTING CHANGES DEBUGGING FEEDBACK FIXES
+%doc README THANKS TODO docs/{QUOTES,README.*,REASONS,progressive.txt}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc html/*
-%{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/XmHTML
 
 %files static