From: NN <skaar@engrhes40agt1>
Date: 21-Mar-2006
Subject: aptrpm update - builds when libtool rpm related .la archives are not in /usr/lib

Index: src/apt/apt.patch
===================================================================
RCS file: /v/openpkg/cvs/openpkg-src/apt/apt.patch,v
retrieving revision 1.16
diff -u -d -u -3 -r1.16 apt.patch
--- src/apt/apt.patch	24 Jan 2004 19:25:20 -0000	1.16
+++ src/apt/apt.patch	22 Mar 2006 00:13:32 -0000
@@ -247,18 +247,6 @@
     fi
     AC_MSG_CHECKING(for RPM libraries)
     AC_MSG_RESULT($RPMLIBS)
-Index: lua/Makefile.in
---- lua/Makefile.in.orig	2003-12-23 21:13:37.000000000 +0100
-+++ lua/Makefile.in	2004-01-24 20:20:12.000000000 +0100
-@@ -192,7 +192,7 @@
- luac_luac_CFLAGS = -DLUA_OPNAMES
- 
- liblua_la_CFLAGS = -DUSE_DLOPEN -DWITH_POSIX
--liblua_la_LIBADD = -lm -ldl
-+liblua_la_LIBADD = -lm
- liblua_la_SOURCES = \
- 		local/linit.c \
- 		local/linit.h \
 Index: lua/local/lrexlib.c
 --- lua/local/lrexlib.c.orig	2003-12-23 21:13:42.000000000 +0100
 +++ lua/local/lrexlib.c	2004-01-24 20:20:12.000000000 +0100
@@ -428,15 +416,15 @@
  		fi
  	done
  	components=`cat $comps|sort|uniq`
-@@ -226,9 +226,9 @@
+@@ -238,9 +238,9 @@
  	fi
  
      if test x$updateinfo = x; then
--    	(cd $basedir; genpkglist $progress $bloat $meta_opts --index $srcidxdir/srcidx.$comp $topdir $comp)
-+    	(cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts --index $srcidxdir/srcidx.$comp $topdir $comp)
+-    	(cd $basedir; genpkglist $progress $bloat $meta_opts $cacheopts --index $srcidxdir/srcidx.$comp $topdir $comp)
++    	(cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts $cacheopts --index $srcidxdir/srcidx.$comp $topdir $comp)
      else
--    	(cd $basedir; genpkglist $progress $bloat $meta_opts --index $srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
-+    	(cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts --index $srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
+-    	(cd $basedir; genpkglist $progress $bloat $meta_opts $cacheopts --index $srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
++    	(cd $basedir; @l_prefix@/bin/genpkglist $progress $bloat $meta_opts $cacheopts --index $srcidxdir/srcidx.$comp --info $updateinfo $topdir $comp)
      fi
  
      if [ -z "$meta" -a -f $basedir/pkglist.$comp ]; then
@@ -616,3 +604,15 @@
  int main(int argc, char ** argv) 
  {
     char buf[300];
+Index: tools/countpkglist.cc
+--- tools/countpkglist.cc.orig	2006-03-21 19:02:53.000000000 -0500
++++ tools/countpkglist.cc	2006-03-21 19:03:16.000000000 -0500
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-
++#include <glob.h>
+ #include <rpm/rpmlib.h>
+ 
+ int main(int argc, char *argv[])
Index: src/apt/apt.spec
===================================================================
RCS file: /v/openpkg/cvs/openpkg-src/apt/apt.spec,v
retrieving revision 1.27
diff -u -d -u -3 -r1.27 apt.spec
--- src/apt/apt.spec	1 Jan 2006 13:11:59 -0000	1.27
+++ src/apt/apt.spec	22 Mar 2006 00:13:32 -0000
@@ -24,7 +24,7 @@
 
 #   package version
 %define       V_base 0.5.15
-%define       V_rev  6
+%define       V_rev  7
 
 #   package information
 Name:         apt
@@ -37,7 +37,7 @@
 Group:        Bootstrapping
 License:      GPL
 Version:      %{V_base}.%{V_rev}
-Release:      20040509
+Release:      20060321
 
 #   list of sources
 Source0:      http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
@@ -121,6 +121,15 @@
         -e 's;^CATALOGS =.*$;CATALOGS =;g' \
         po/Makefile
 
+    %{l_shtool} subst \
+        -e "s;--tag=CC;;g" \
+        -e "s;--tag=CXX;;g" \
+        apt-pkg/Makefile \
+        cmdline/Makefile \
+        lua/Makefile \
+        methods/Makefile \
+        tools/Makefile \
+
     #   build package
     %{l_make} %{l_mflags}