- updated to 1.4rc5, updated URLs

- removed obsolete xref and autoconf patches

Changed files:
    aalib-autoconf.patch -> 1.2
    aalib-xref.patch -> 1.2
    aalib.spec -> 1.38

diff --git a/aalib-autoconf.patch b/aalib-autoconf.patch
deleted file mode 100644 (file)
index efa6c6f..0000000
--- a/aalib-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru aalib-1.2/aclocal.m4 aalib-1.2.new/aclocal.m4
---- aalib-1.2/aclocal.m4       Tue Nov 11 21:17:00 1997
-+++ aalib-1.2.new/aclocal.m4   Thu Jul  1 02:18:25 1999
-@@ -10,7 +10,7 @@
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+[AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]

diff --git a/aalib-xref.patch b/aalib-xref.patch
deleted file mode 100644 (file)
index 6c09e8b..0000000
--- a/aalib-xref.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN aalib-1.2.orig/aalib.texinfo aalib-1.2/aalib.texinfo
---- aalib-1.2.orig/aalib.texinfo       Sun Mar  8 21:46:45 1998
-+++ aalib-1.2/aalib.texinfo    Mon Apr  5 03:03:36 1999
-@@ -1160,7 +1160,7 @@
- It is @code{NULL} by default. Last is pointer to hardware_params structure,
- where driver will put parameters of initialized device.
- This structure holds information about atributes and parameters supported
--by your driver. @xref{Initialization for image saving}
-+by your driver. @xref{Initialization for image saving}.
- Just first two fields are used (@code{font} and @code{supported}).
- @var{Font} is pointer to font structure used by hardware. This field should be filed
- at runtime (see @code{aalinux.c} for example), set statically to one of
-@@ -1183,7 +1183,7 @@
- will automatically free this pointer at @code{aa_close} if it is non-NULL.
- 
- This function should also recomend best available keyboard and mouse drivers.
--@xref{How does the autodetection work}
-+@xref{How does the autodetection work}.
- @end deffn
- 
- @deffn Function uninit
-@@ -1262,7 +1262,7 @@
- key releases too. Note that driver should send releases even @var{mode} is 0.
- 
- This function should also recomend best available mouse driver.
--@xref{How does the autodetection work}
-+@xref{How does the autodetection work}.
- @end deffn
- 
- @deffn Function uninit

diff --git a/aalib.spec b/aalib.spec
index 9b24b304390a5b27119400f836999cdb97af52e9..3569884dbec60d1aa644ac736ac89048ae6cd080 100644 (file)
--- a/aalib.spec
+++ b/aalib.spec
@@ -1,22 +1,19 @@
 Summary:       An ASCII art GFX library
 Summary(fr):   Bibliothèque AA (Ascii Art)
-Summary(pl):   Biblioteka GFX sztuki w ASCII
+Summary(pl):   Biblioteka graficzna ASCII Art
 Name:          aalib
-Version:       1.2
-Release:       15
+Version:       1.4rc5
+Release:       1
 License:       LGPL
 Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
-Source0:       ftp://ftp.ta.jcu.cz/pub/aa/%{name}-%{version}.tar.gz
-Patch0:                %{name}-xref.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-autoconf.patch
-URL:           http://horac.ta.jcu.cz/aa/aalib/
-BuildRequires: automake
-BuildRequires: autoconf
+Source0:       ftp://download.sourceforge.net/pub/sourceforge/aa-project/%{name}-%{version}.tar.gz
+Patch0:                %{name}-info.patch
+URL:           http://aa-project.sourceforge.net/
 BuildRequires: gpm-devel
-BuildRequires: libtool
 BuildRequires: slang-devel
 BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,11 +32,11 @@ La biblioth
 de travailler dans des contextes graphiques sans affichage.
 
 %description -l pl
-AA-lib jest niskopoziomow± bibliotek± gfx podobnie jak wiele innych
-bibliotek. G³ówna ró¿nica pomiêdzy nimi jest taka, ¿e AA-lib nie
+AA-lib jest niskopoziomow± bibliotek± graficzn± podobnie jak wiele
+innych bibliotek. G³ówna ró¿nica pomiêdzy nimi jest taka, ¿e AA-lib nie
 wymaga trybu graficznego. W³a¶ciwie nie ma mo¿liwo¶ci wy¶wietlenia
 czego¶ w trybie graficznym. AA-lib zastêpuje te staromodne metody
-wysoko wydajnym narzêdziem do renderowania ascii-art. Teraz mój linux
+wysoko wydajnym narzêdziem do renderowania ascii-art. Teraz mój Linux
 startuje z ³adnym logo pingwina na drugim monitorze. AA-lib API jest
 zaprojektowane tak by byæ podobnym do innych graficznych bibliotek.
 Nauka nowego API bêdzie bu³k± z mas³em!
@@ -48,6 +45,8 @@ Nauka nowego API b
 Summary:       Header files libraries for aalib
 Summary(pl):   Pliki nag³ówkowe dla aalib
 Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
 Requires:      %{name} = %{version}
@@ -62,6 +61,8 @@ Pliki nag
 Summary:       Static aalib library
 Summary(pl):   Statyczna biblioteka aalib
 Group:         Libraries
+Group(de):     Libraries
+Group(es):     Bibliotecas
 Group(fr):     Librairies
 Group(pl):     Biblioteki
 Requires:      %{name}-devel = %{version}
@@ -75,8 +76,9 @@ Statyczna biblioteka aalib.
 %package progs
 Summary:       AA-lib tools
 Summary(pl):   Narzêdzia AA-lib
-Group:         Utilities/Terminal
-Group(pl):     Narzêdzia/Terminal
+Group:         Applications/Terminal
+Group(de):     Applikationen/Terminal
+Group(pl):     Aplikacje/Terminal
 Requires:      %{name} = %{version}
 
 %description progs
@@ -86,16 +88,10 @@ AA-lib tools.
 Narzêdzia AA-lib.
 
 %prep
-%setup -q
+%setup -q -n %{name}-1.4.0
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-aclocal
-autoconf
-automake -a -c
-libtoolize --copy --force
 %configure
 %{__make}
 
@@ -126,10 +122,13 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc *.gz
+%attr(755,root,root) %{_bindir}/aalib-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/*.h
-%{_infodir}/*.info.*
+%{_infodir}/*.info*
+%{_mandir}/man3/*
+%{_aclocaldir}/*.m4
 
 %files static
 %defattr(644,root,root,755)
@@ -137,4 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/aafire
+%attr(755,root,root) %{_bindir}/aainfo
+%attr(755,root,root) %{_bindir}/aasavefont
+%attr(755,root,root) %{_bindir}/aatest
+%{_mandir}/man1/*