0.5.15cnc5-alt4

- Fixed build with fresh autotools.

apt-0.5.15cnc5-alt-gettext.patch

@@ -0,0 +1,20 @@
+--- apt-0.5.15cnc5/configure.in.orig	2004-02-27 20:36:42 +0300
++++ apt-0.5.15cnc5/configure.in	2004-02-27 20:39:42 +0300
+@@ -221,7 +221,7 @@
+ AM_CONDITIONAL(COMPILE_MANPAGES, test -n "$DOCBOOK2MAN" -a "$enable_docs" != "no")
+ 
+ AM_GNU_GETTEXT_VERSION([0.11.4])
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ dnl ah_NUM_PROCS
+ rc_GLIBC_VER
+--- apt-0.5.15cnc5/Makefile.am.orig	2003-12-23 23:30:18 +0300
++++ apt-0.5.15cnc5/Makefile.am	2004-02-27 20:46:05 +0300
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS = buildlib intl lua apt-pkg methods cmdline tools doc m4 po
++SUBDIRS = buildlib lua apt-pkg methods cmdline tools doc m4 po
+ 
+ ACLOCAL_AMFLAGS = -I m4 -I buildlib
+ 

apt-0.5.15cnc5-alt-rpm-build.patch

@@ -22,7 +22,7 @@ diff -uprk.orig apt-0.5.15cnc5.orig/configure.in apt-0.5.15cnc5/configure.in
 +         [RPMDBLIBS="-ldb"],
           [-lrpm -lrpmio -lz -lbz2 -lpopt])
 -      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
-+      RPMLIBS="-lrpm $RPMDBLIBS"
++      RPMLIBS="-lrpm -lrpmio $RPMDBLIBS"
     fi
     AC_MSG_CHECKING(for RPM libraries)
     AC_MSG_RESULT($RPMLIBS)

apt.spec

@@ -2,7 +2,7 @@
 
 Name: apt
 Version: 0.5.15cnc5
-Release: alt3
+Release: alt4
 
 Summary: Debian's Advanced Packaging Tool with RPM support
 Summary(ru_RU.CP1251): Debian APT - Óñîâåðøåíñòâîâàííîå ñðåäñòâî óïðàâëåíèÿ ïàêåòàìè ñ ïîääåðæêîé RPM
@@ -39,6 +39,7 @@ Patch27: apt-0.5.15cnc5-alt-install_virtual.patch
 Patch28: apt-0.5.15cnc5-alt-virtual_scores.patch
 Patch29: apt-0.5.15cnc5-alt-system-lua5.patch
 Patch30: apt-0.5.15cnc5-alt-findrepos.patch
+Patch31: apt-0.5.15cnc5-alt-gettext.patch
 
 # Normally not applied, but useful.
 Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
@@ -57,6 +58,9 @@ BuildPreReq: docbook-utils
 # lua5.
 BuildPreReq: liblua5-devel
 
+# autopoint
+BuildPreReq: cvs
+
 %def_disable static
 %{?_enable_static:BuildPreReq: glibc-devel-static}
 
@@ -214,6 +218,7 @@ This package contains method 'rsync' for APT.
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
+%patch31 -p1
 
 # Use system-wide lua5
 pushd lua
@@ -231,10 +236,7 @@ popd
 # Fix url.
 %__subst -p 's,/usr/share/common-licenses/GPL,/usr/share/license/GPL,' COPYING
 
-%__aclocal -I buildlib
-# rsync patch update only methods/Makefile.am so need to run automake
-%__automake
-%__autoconf
+autoreconf -fisv -I buildlib
 
 # --disable-dependency-tracking Speeds up one-time builds
 %configure --includedir=%_includedir/apt-pkg %{subst_enable static}
@@ -328,6 +330,9 @@ fi
 # Probably %%doc with README.rsync?
 
 %changelog
+* Fri Feb 27 2004 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc5-alt4
+- Fixed build with fresh autotools.
+
 * Wed Jan 21 2004 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc5-alt3
 - Readded contrib to documentation.
 - Updated russian translation from Anton Denisov.