X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=aalib.spec;h=9cdce24cfb7f89ddeb762da3efda1e549eda4f0c;hb=fdce64f74a779af943e16157b63d4aa65401b311;hp=f1149919cc905a03f37a521923fe8fa2caff07ba;hpb=d53b0c1f0dec44fd6add16943ffd35f3bc6ef130;p=packages%2Faalib.git

diff --git a/aalib.spec b/aalib.spec
index f114991..9cdce24 100644
--- a/aalib.spec
+++ b/aalib.spec
@@ -7,13 +7,15 @@ Summary(ru):	
 Summary(uk):	â¦Â̦ÏÔÅËÁ ËÏÎÓÏÌØÎϧ ÇÒÁƦËÉ (ASCII Art)
 Name:		aalib
 Version:	1.4rc5
-Release:	7
+Release:	9
 License:	LGPL
 Group:		Libraries
-Source0:	ftp://download.sourceforge.net/pub/sourceforge/aa-project/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/aa-project/%{name}-%{version}.tar.gz
+# Source0-md5:	9801095c42bba12edebd1902bcf0a990
 Source1:	%{name}-config.1
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-debian_man.patch
+Patch2:		%{name}-am18.patch
 URL:		http://aa-project.sourceforge.net/
 BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
@@ -65,7 +67,6 @@ AA-lib - 
 ÐÒÉÓÔÒÏÀ. îÁÓÐÒÁ×Ħ, ÇÒÁƦÞÎÉÊ (× Ú×ÉÞÎÏÍÕ ÒÏÚÕͦÎΦ ÃØÏÇÏ ÓÌÏ×Á)
 ×É×¦Ä ¦ ÎÅÍÏÖÌÉ×ÉÊ. AA-lib ÐÅÒÅÔ×ÏÒÀ¤ ÇÒÁƦËÕ × ÔÁË Ú×ÁÎÉÊ ASCII-Art.
 
-
 %package devel
 Summary:	Header files and libraries for aalib
 Summary(pl):	Pliki nag³ówkowe dla aalib
@@ -133,12 +134,17 @@ Narz
 %setup -q -n %{name}-1.4.0
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+# don't include aclocal.m4 from configure.in
+tail -n +2 configure.in > c.tmp
+mv -f c.tmp configure.in
 
 %build
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c -f
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 %{__make}
 
@@ -148,8 +154,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/aalib-config.1
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/aalib-config.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,17 +170,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc README NEWS AUTHORS ANNOUNCE ChangeLog
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc README NEWS AUTHORS ANNOUNCE ChangeLog
 %attr(755,root,root) %{_bindir}/aalib-config
-%{_mandir}/man1/aalib-config.1*
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/*.h
 %{_infodir}/*.info*
+%{_mandir}/man1/aalib-config.1*
 %{_mandir}/man3/*
 %{_aclocaldir}/*.m4