- mass commit: cosmetics (removed trailing white spaces)

[packages/XmHTML.git] / XmHTML.spec

diff --git a/XmHTML.spec b/XmHTML.spec
index 29e1f02b76f6fac324535fc6f523f75b03326f3f..7d04296610df8e53800640ee9a84e30366f8eda7 100644 (file)
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -2,25 +2,22 @@ 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
 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/
-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
-
 %description
 XmHTML provides a widget capable of displaying HTML 3.2 conforming
 text.
@@ -33,6 +30,7 @@ Summary:      Development package of XmHTML
 Summary(pl):   Pliki nag³ówkowe XmHTML
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      lesstif-devel
 
 %description devel
 Headers needed to compile XmHTML programs.
@@ -62,15 +60,16 @@ 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 .
-)
+cd ..
 
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c
+rm -f missing
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 CFLAGS="%{rpmcflags} \
        -I`pwd`/include/XmHTML -I`pwd`/include/common \
        %{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
@@ -83,7 +82,8 @@ cd lib
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/XmHTML
 
-%{__make} install -C lib 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 \
@@ -91,10 +91,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 \
-       README THANKS TODO docs/{QUOTES,README.*,REASONS,progressive.txt}
-
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
@@ -102,14 +99,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/*
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/XmHTML
 
 %files static