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

diff --git a/XmHTML.spec b/XmHTML.spec
index 925908f..2ae89a5 100644
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -1,62 +1,57 @@
 Summary:	Motif HTML widget
-Summary(pl):	Widget do HTML oparty o Motif
+Summary(pl.UTF-8):	Widget do HTML-a oparty o Motif
 Name:		XmHTML
 Version:	1.1.7
-Release:	1
+Release:	9
 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
+# Source0-md5:	6d079435fb954bb7878f4dd0d3f7b8d8
 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
-
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libtool
+BuildRequires:	motif-devel >= 1.2
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 XmHTML provides a widget capable of displaying HTML 3.2 conforming
 text.
 
-%description -l pl
-XmHTML zawiera widget wy¶wietlaj±cy HTML w wersji 3.2.
+%description -l pl.UTF-8
+XmHTML zawiera widget wyświetlający HTML w wersji 3.2.
 
 %package devel
 Summary:	Development package of XmHTML
-Summary(pl):	Pliki nag³ówkowe XmHTML
+Summary(pl.UTF-8):	Pliki nagłówkowe XmHTML
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(pl):	X11/Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	libjpeg-devel
+Requires:	libpng-devel
+Requires:	motif-devel >= 1.2
 
 %description devel
 Headers needed to compile XmHTML programs.
 
-%description devel -l pl
-Pliki nag³ówkowe potrzebne do kompilowania programów korzystaj±cych
-z XmHTML.
+%description devel -l pl.UTF-8
+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
+Summary(pl.UTF-8):	Statyczna biblioteka XmHTML
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(pl):	X11/Programowanie/Biblioteki
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static version of XmHTML library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna wersja biblioteki XmHTML.
 
 %prep
@@ -68,18 +63,18 @@ Statyczna wersja biblioteki XmHTML.
 # Argh! automake stuff outdated, imake stuff outdated even more,
 # makefiles not outdated but don't support shared libraries :/
 # Use automake with some patches/workarounds/etc
-(cd lib
+cd lib
 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"
+cd ..
+
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+CFLAGS="%{rpmcflags} \
+	-I`pwd`/include/XmHTML -I`pwd`/include/common \
+	%{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
 %configure
 
 cd lib
@@ -89,9 +84,8 @@ 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,11 +93,7 @@ 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 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
@@ -111,14 +101,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