- fixed version - release number

[packages/aalib.git] / aalib.spec

diff --git a/aalib.spec b/aalib.spec
index 0891b16ed3ffde27cdf04d107bb4a3422528ea3b..c93a7031ce6690ce1fe3fc1976a8c0aa7e04fd00 100644 (file)
--- a/aalib.spec
+++ b/aalib.spec
@@ -6,21 +6,27 @@ Summary(pt_BR):       Uma biblioteca para ASCII art
 Summary(ru):   âÉÂÌÉÏÔÅËÁ ËÏÎÓÏÌØÎÏÊ ÇÒÁÆÉËÉ (ASCII Art)
 Summary(uk):   â¦Â̦ÏÔÅËÁ ËÏÎÓÏÌØÎϧ ÇÒÁƦËÉ (ASCII Art)
 Name:          aalib
-Version:       1.4rc5
-Release:       6
+%define         _rc     rc5
+%define         _rel    11
+Version:       1.4
+Release:       0.%{_rc}.%{_rel}
+Epoch:         1
 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}%{_rc}.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
 BuildRequires: automake
 BuildRequires: gpm-devel
 BuildRequires: libtool
-BuildRequires: slang-devel
+BuildRequires: slang-devel >= 2.0.0
+BuildRequires: texinfo
+BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,9 +38,6 @@ linux boots with a nice penguin logo at secondary display (yes! Like
 Win95 does:) AA-lib API is designed to be similar to other graphics
 libraries. Learning a new API would be a piece of cake!
 
-%description -l es
-Biblioteca ASCII art.
-
 %description -l fr
 La bibliothèque AA est nécessaire pour GIMP. Elle offre la possibilité
 de travailler dans des contextes graphiques sans affichage.
@@ -65,17 +68,16 @@ AA-lib - 
 ÐÒÉÓÔÒÏÀ. îÁÓÐÒÁ×Ħ, ÇÒÁƦÞÎÉÊ (× Ú×ÉÞÎÏÍÕ ÒÏÚÕͦÎΦ ÃØÏÇÏ ÓÌÏ×Á)
 ×É×¦Ä ¦ ÎÅÍÏÖÌÉ×ÉÊ. AA-lib ÐÅÒÅÔ×ÏÒÀ¤ ÇÒÁƦËÕ × ÔÁË Ú×ÁÎÉÊ ASCII-Art.
 
-
 %package devel
 Summary:       Header files and libraries for aalib
 Summary(pl):   Pliki nag³ówkowe dla aalib
 Summary(ru):   èÅÄÅÒÙ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÒÏÇÒÁÍÍ Ó AAlib
 Summary(uk):   èÅÄÅÒÉ ÄÌÑ ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ Ú AAlib
-Group:         Libraries
-Requires:      %{name} = %{version}
-Requires:      slang-devel
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
 Requires:      gpm-devel
-Requires:      XFree86-devel
+Requires:      slang-devel
+Requires:      xorg-lib-libX11-devel
 
 %description devel
 The header files for development of programs using the AAlib.
@@ -94,8 +96,8 @@ Summary:      Static aalib library
 Summary(pl):   Statyczna biblioteka aalib
 Summary(ru):   óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÒÏÇÒÁÍÍ Ó aalib
 Summary(uk):   óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÏÂÕÄÏ×É ÐÒÏÇÒÁÍ Ú aalib
-Group:         Libraries
-Requires:      %{name}-devel = %{version}
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Static aalib library.
@@ -115,7 +117,7 @@ Summary(pl):        Narz
 Summary(ru):   õÔÉÌÉÔÙ ÄÌÑ AA-lib
 Summary(uk):   õÔÉ̦ÔÉ ÄÌÑ AA-lib
 Group:         Applications/Terminal
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 
 %description progs
 AA-lib tools.
@@ -133,12 +135,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,16 +155,13 @@ 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
-
-gzip -9nf README NEWS AUTHORS ANNOUNCE ChangeLog
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/aalib-config.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %post devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
@@ -167,17 +171,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 *.gz
 %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
 
@@ -191,4 +195,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/aainfo
 %attr(755,root,root) %{_bindir}/aasavefont
 %attr(755,root,root) %{_bindir}/aatest
-%{_mandir}/man1/*
+%{_mandir}/man1/aafire.1*