- mass commit: cosmetics (removed trailing white spaces)

[packages/XmHTML.git] / XmHTML.spec

diff --git a/XmHTML.spec b/XmHTML.spec
index eaf76e0b905271bf15fcc0d90742d101ce0f36aa..7d04296610df8e53800640ee9a84e30366f8eda7 100644 (file)
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -6,6 +6,7 @@ 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/
@@ -17,9 +18,6 @@ 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.
@@ -62,10 +60,10 @@ 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 ..
 
 rm -f missing
 %{__libtoolize}
@@ -75,7 +73,7 @@ rm -f missing
 CFLAGS="%{rpmcflags} \
        -I`pwd`/include/XmHTML -I`pwd`/include/common \
        %{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
-%configure PNGINC="`pkg-config --cflags libpng12 2>/dev/null`"
+%configure
 
 cd lib
 %{__make}
@@ -84,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 \
@@ -92,7 +91,7 @@ install include/XmHTML/{Balloon,HTML,HTMLStrings,XCC,XmHTML}.h \
 
 rm -f html/man/man.{map,tmpl}
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig