SPECS: leptonlib.spec - updated to 1.57 (uses ac/am now; note: includedir c...

[qboosh]

Author: qboosh                       Date: Sun Jul 20 08:22:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.57 (uses ac/am now; note: includedir changed)
- outdated link patch replaced by shared patch (to make shared library again)

---- Files affected:
SPECS:
   leptonlib.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/leptonlib.spec
diff -u SPECS/leptonlib.spec:1.15 SPECS/leptonlib.spec:1.16
--- SPECS/leptonlib.spec:1.15	Thu Mar 27 01:18:04 2008
+++ SPECS/leptonlib.spec	Sun Jul 20 10:22:28 2008
@@ -2,18 +2,22 @@
 Summary:	Leptonica - image processing and analysis library
 Summary(pl.UTF-8):	Leptonica - biblioteka do przetwarzania i analizy obrazu
 Name:		leptonlib
-Version:	1.55
+Version:	1.57
 Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	http://www.leptonica.com/source/%{name}-%{version}.tar.gz
-# Source0-md5:	a66ad0d2c04bbb87db750ba619b2d578
-Patch0:		%{name}-link.patch
+# Source0-md5:	4c0deb5b18765e9db2dd675c5fb47d08
+Patch0:		%{name}-shared.patch
 Patch1:		%{name}-endiantest.patch
 URL:		http://www.leptonica.com/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
+BuildRequires:	giflib-devel >= 4
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,6 +31,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki lepton
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	giflib-devel >= 4
 Requires:	libjpeg-devel
 Requires:	libpng-devel
 Requires:	libtiff-devel
@@ -55,24 +60,21 @@
 %patch1 -p1
 
 %build
-%{__make} -C src nodebug \
-	CC="%{__cc} -ansi -DANSI -D_BSD_SOURCE" \
-	OPTIMIZE="%{rpmcflags}"
-
-%{__make} -C src shared \
-	CC="%{__cc} -ansi -DANSI -D_BSD_SOURCE" \
-	LIBRARIAN_SHARED="%{__cc} -shared" \
-	OPTIMIZE="%{rpmcflags} -fPIC" \
-	LDFLAGS="%{rpmldflags}" \
-	SHARED=yes
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir}/lept,%{_libdir}}
 
-install lib/nodebug/liblept.a $RPM_BUILD_ROOT%{_libdir}
-cp -af lib/shared/liblept.so* $RPM_BUILD_ROOT%{_libdir}
-install src/*.h $RPM_BUILD_ROOT%{_includedir}/lept
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,14 +84,15 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README.html version-notes.html moller52.jpg
+%doc README.html leptonica-license.txt version-notes.html moller52.jpg
 %attr(755,root,root) %{_libdir}/liblept.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblept.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liblept.so
-%{_includedir}/lept
+%{_libdir}/liblept.la
+%{_includedir}/liblept
 
 %files static
 %defattr(644,root,root,755)
@@ -101,6 +104,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008/07/20 08:22:28  qboosh
+- updated to 1.57 (uses ac/am now; note: includedir changed)
+- outdated link patch replaced by shared patch (to make shared library again)
+
 Revision 1.15  2008/03/27 00:18:04  sls
 - rel. 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/leptonlib.spec?r1=1.15&r2=1.16&f=u