X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chmlib.spec;h=fa4d8f5be991ac79af635fa19f0fc0ee55376be3;hb=afb37e8b0559a4de0053d073924564ee85cb898d;hp=bb2453f00242783e4ec490245deb449ce7264806;hpb=1813aa376de7efbcde71a4c0b0fcc272984c0101;p=packages%2Fchmlib.git

diff --git a/chmlib.spec b/chmlib.spec
index bb2453f..fa4d8f5 100644
--- a/chmlib.spec
+++ b/chmlib.spec
@@ -1,27 +1,29 @@
 Summary:	chmlib - library designed for accessing MS ITSS files
 Summary(pl):	chmlib - biblioteka pozwalaj±ca na dostêp do plików MS ITSS
 Name:		chmlib
-Version:	0.31
-Release:	3
+Version:	0.36
+Release:	1
 License:	GPL
 Group:		Libraries
 Source0:	http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tbz
-Patch0:		%{name}-sparcppc.patch
-# Source0-md5:	c6c9e1658f43715456e00a4893d496ed
+# Source0-md5:	fd895bc91d13c18867a5dac6d44ef772
+Patch0:		%{name}-morearchs.patch
+Patch1:		%{name}-LIBDIR.patch
 URL:		http://66.93.236.84/~jedwin/projects/chmlib/
-BuildRequires:	libtool
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 chmlib is a small library designed for accessing MS ITSS files. The
-ITSS file format is used for Microsoft Html Help files (.chm), which
+ITSS file format is used for Microsoft HTML Help files (.chm), which
 have been the predominant medium for software documentation from
 Microsoft during the past several years, having superceded the
 previously used .hlp file format.
 
 %description -l pl
 chmlib to niewielka biblioteka przeznaczona do odczytu plików MS ITSS.
-Format ITSS jest u¿ywany w plikach Microsoft Html Help (.chm), które
+Format ITSS jest u¿ywany w plikach Microsoft HTML Help (.chm), które
 sta³y siê dominuj±cym medium dla elektronicznej dokumentacji
 udostêpnianej przez Microsoft w ostatnim czasie, zastêpuj±c poprzednio
 u¿ywane pliki .hlp.
@@ -30,7 +32,7 @@ u
 Summary:	chmlib header files
 Summary(pl):	Pliki nag³ówkowe chmlib
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Header files needed for building programs that use chmlib.
@@ -42,7 +44,7 @@ Pliki nag
 Summary:	chmlib static library
 Summary(pl):	Biblioteka statyczna chmlib
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static version of chmlib.
@@ -52,21 +54,26 @@ Statyczna wersja chmlib.
 
 %prep
 %setup -q
-%patch0
+%patch0 -p1
+%patch1 -p1
 
 %build
-%{__make} all examples \
-	CFLAGS="%{rpmcflags} -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -L.libs" \
-	LDFLAGS="%{rpmldflags} -lpthread" \
-	CC="%{__cc}" LD="%{__cc}" \
-	INSTALLPREFIX="%{_prefix}"
+cp -f /usr/share/automake/config.* .
+%{__autoconf}
+%configure
+
+%{__make}
+
+%{__make} examples \
+	LIBDIR=src/.libs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir}}
 
 %{__make} install \
-	INSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix}
+	INSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix} \
+	LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 install *_chmLib chm_http $RPM_BUILD_ROOT%{_bindir}