- fix format string error

[packages/XmHTML.git] / XmHTML.spec

diff --git a/XmHTML.spec b/XmHTML.spec
index 686c999edacbdef1c61df78b0862e910059f5763..3e9c2d58fcfc241a73d5391f817972504dc13c50 100644 (file)
--- a/XmHTML.spec
+++ b/XmHTML.spec
@@ -1,62 +1,68 @@
 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:       2
+Release:       14
 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
+Patch2:                %{name}-libpng.patch
+Patch3:                format-security.patch
 URL:           http://www.xs4all.nl/~ripley/XmHTML/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: lesstif-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtool
+BuildRequires: motif-devel >= 1.2
+BuildRequires: xorg-lib-libXmu-devel
+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
-Requires:      %{name} = %{version}
-Requires:      lesstif-devel
+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
+%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
-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
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
-%build
+%patch2 -p1
+%patch3 -p1
 # 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
@@ -65,7 +71,7 @@ mv -f common/*.c .
 mv -f Motif/*.c .
 cd ..
 
-rm -f missing
+%build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -74,7 +80,7 @@ CFLAGS="%{rpmcflags} \
        -I`pwd`/include/XmHTML -I`pwd`/include/common \
        %{!?debug:-DNDEBUG -Dproduction} -DVERSION=1107"
 %configure \
-       PNGINC="`pkg-config --cflags libpng12 2>/dev/null`"
+       LIBS="-lm"
 
 cd lib
 %{__make}
@@ -92,7 +98,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
@@ -102,15 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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.*.*
+%attr(755,root,root) %{_libdir}/libXmHTML.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libXmHTML.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %doc html/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libXmHTML.so
+%{_libdir}/libXmHTML.la
 %{_includedir}/XmHTML
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libXmHTML.a