OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jan-2004 20:25:21
Branch: HEAD Handle: 2004012419252000
Modified files:
openpkg-src/apt apt.patch apt.spec
Log:
fix the source of the problem and reduce extra dependencies again
Summary:
Revision Changes Path
1.16 +35 -23 openpkg-src/apt/apt.patch
1.18 +2 -2 openpkg-src/apt/apt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 apt.patch
--- openpkg-src/apt/apt.patch 31 Dec 2003 11:55:10 -0000 1.15
+++ openpkg-src/apt/apt.patch 24 Jan 2004 19:25:20 -0000 1.16
@@ -1,6 +1,6 @@
Index: apt-pkg/deb/debsystem.cc
--- apt-pkg/deb/debsystem.cc.orig 2003-12-23 21:18:33.000000000 +0100
-+++ apt-pkg/deb/debsystem.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/deb/debsystem.cc 2004-01-24 20:20:12.000000000 +0100
@@ -162,7 +162,7 @@
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
@@ -21,7 +21,7 @@
Score += 10;
Index: apt-pkg/init.cc
--- apt-pkg/init.cc.orig 2003-12-23 21:18:15.000000000 +0100
-+++ apt-pkg/init.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/init.cc 2004-01-24 20:20:12.000000000 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -55,7 +55,7 @@
bool Res = true;
Index: apt-pkg/luaiface.cc
--- apt-pkg/luaiface.cc.orig 2003-12-23 21:19:11.000000000 +0100
-+++ apt-pkg/luaiface.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/luaiface.cc 2004-01-24 20:20:12.000000000 +0100
@@ -81,7 +81,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
@@ -67,7 +67,7 @@
{"base", luaopen_base},
Index: apt-pkg/rpm/rpmhandler.h
--- apt-pkg/rpm/rpmhandler.h.orig 2003-12-23 21:19:27.000000000 +0100
-+++ apt-pkg/rpm/rpmhandler.h 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmhandler.h 2004-01-24 20:20:12.000000000 +0100
@@ -12,6 +12,7 @@
#include <apt-pkg/fileutl.h>
@@ -78,7 +78,7 @@
Index: apt-pkg/rpm/rpmpackagedata.cc
--- apt-pkg/rpm/rpmpackagedata.cc.orig 2003-12-23 21:19:36.000000000 +0100
-+++ apt-pkg/rpm/rpmpackagedata.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmpackagedata.cc 2004-01-24 20:20:12.000000000 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -89,7 +89,7 @@
RPMPackageData::RPMPackageData()
Index: apt-pkg/rpm/rpmpm.cc
--- apt-pkg/rpm/rpmpm.cc.orig 2003-12-23 21:19:20.000000000 +0100
-+++ apt-pkg/rpm/rpmpm.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmpm.cc 2004-01-24 20:20:12.000000000 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -100,7 +100,7 @@
#define packagesTotal rpmcliPackagesTotal
Index: apt-pkg/rpm/rpmpm.h
--- apt-pkg/rpm/rpmpm.h.orig 2003-12-23 21:19:23.000000000 +0100
-+++ apt-pkg/rpm/rpmpm.h 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmpm.h 2004-01-24 20:20:12.000000000 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -111,7 +111,7 @@
#include <rpm/rpmts.h>
Index: apt-pkg/rpm/rpmrecords.h
--- apt-pkg/rpm/rpmrecords.h.orig 2003-12-23 21:19:51.000000000 +0100
-+++ apt-pkg/rpm/rpmrecords.h 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmrecords.h 2004-01-24 20:20:12.000000000 +0100
@@ -21,6 +21,7 @@
#include <apt-pkg/pkgrecords.h>
@@ -122,7 +122,7 @@
Index: apt-pkg/rpm/rpmsrcrecords.h
--- apt-pkg/rpm/rpmsrcrecords.h.orig 2003-12-23 21:20:01.000000000 +0100
-+++ apt-pkg/rpm/rpmsrcrecords.h 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmsrcrecords.h 2004-01-24 20:20:12.000000000 +0100
@@ -17,6 +17,7 @@
#include <apt-pkg/srcrecords.h>
@@ -133,7 +133,7 @@
Index: apt-pkg/rpm/rpmsystem.cc
--- apt-pkg/rpm/rpmsystem.cc.orig 2003-12-23 21:19:32.000000000 +0100
-+++ apt-pkg/rpm/rpmsystem.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmsystem.cc 2004-01-24 20:20:12.000000000 +0100
@@ -126,13 +126,13 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
@@ -162,7 +162,7 @@
return Score;
Index: apt-pkg/rpm/rpmversion.cc
--- apt-pkg/rpm/rpmversion.cc.orig 2003-12-23 21:19:34.000000000 +0100
-+++ apt-pkg/rpm/rpmversion.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/rpm/rpmversion.cc 2004-01-24 20:20:12.000000000 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -173,7 +173,7 @@
Index: apt-pkg/sourcelist.cc
--- apt-pkg/sourcelist.cc.orig 2003-12-23 21:17:28.000000000 +0100
-+++ apt-pkg/sourcelist.cc 2003-12-31 12:40:02.000000000 +0100
++++ apt-pkg/sourcelist.cc 2004-01-24 20:20:12.000000000 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -185,7 +185,7 @@
return CreateItem(List,URI,Dist,Section,Vendor);
Index: cmdline/apt-shell.cc
--- cmdline/apt-shell.cc.orig 2003-12-23 21:31:46.000000000 +0100
-+++ cmdline/apt-shell.cc 2003-12-31 12:40:02.000000000 +0100
++++ cmdline/apt-shell.cc 2004-01-24 20:20:12.000000000 +0100
@@ -3672,7 +3672,7 @@
" remove - Remove packages\n"
" keep - Keep packages\n"
@@ -207,7 +207,7 @@
Index: configure.in
--- configure.in.orig 2003-12-23 21:15:40.000000000 +0100
-+++ configure.in 2003-12-31 12:40:23.000000000 +0100
++++ configure.in 2004-01-24 20:21:50.000000000 +0100
@@ -47,7 +47,7 @@
dnl Check for RPM version
@@ -217,6 +217,18 @@
RPM_VERSION_MAJOR=`echo $RPM_VERSION_RAW | cut -d. -f1`
RPM_VERSION_MINOR=`echo $RPM_VERSION_RAW | cut -d. -f2`
RPM_VERSION_MICRO=`echo $RPM_VERSION_RAW | cut -d. -f3`
+@@ -68,9 +68,9 @@
+
+ dnl Check for RPM libraries and headers
+
+- AC_CHECK_LIB(bz2,BZ2_bzopen, [],
++ AC_CHECK_LIB(rpmbz2,BZ2_bzopen, [],
+ [AC_MSG_ERROR([Can't find libbz2 library])])
+- AC_CHECK_LIB(z,gzopen, [],
++ AC_CHECK_LIB(rpmz,gzopen, [],
+ [AC_MSG_ERROR([Can't find libz library])])
+ AC_CHECK_HEADERS(db1/db.h)
+
@@ -79,13 +79,13 @@
[AC_MSG_ERROR([Can't find rpmlib.h])])
@@ -237,7 +249,7 @@
AC_MSG_RESULT($RPMLIBS)
Index: lua/Makefile.in
--- lua/Makefile.in.orig 2003-12-23 21:13:37.000000000 +0100
-+++ lua/Makefile.in 2003-12-31 12:40:02.000000000 +0100
++++ lua/Makefile.in 2004-01-24 20:20:12.000000000 +0100
@@ -192,7 +192,7 @@
luac_luac_CFLAGS = -DLUA_OPNAMES
@@ -249,7 +261,7 @@
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 2003-12-31 12:40:02.000000000 +0100
++++ lua/local/lrexlib.c 2004-01-24 20:20:12.000000000 +0100
@@ -20,6 +20,7 @@
#ifdef WITH_POSIX
@@ -260,7 +272,7 @@
static int rex_comp(lua_State *L) {
Index: methods/gpg.cc
--- methods/gpg.cc.orig 2003-12-23 21:24:04.000000000 +0100
-+++ methods/gpg.cc 2003-12-31 12:40:02.000000000 +0100
++++ methods/gpg.cc 2004-01-24 20:20:12.000000000 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -357,7 +369,7 @@
const char *outfile, string &signerKeyID)
Index: methods/http.cc
--- methods/http.cc.orig 2003-12-23 21:24:14.000000000 +0100
-+++ methods/http.cc 2003-12-31 12:40:02.000000000 +0100
++++ methods/http.cc 2004-01-24 20:20:12.000000000 +0100
@@ -680,7 +680,7 @@
// CNC:2003-01-29
string UserAgent = _config->Find("Acquire::http::User-Agent");
@@ -369,7 +381,7 @@
if (Debug == true)
Index: test/scratch.cc
--- test/scratch.cc.orig 2003-12-23 21:13:20.000000000 +0100
-+++ test/scratch.cc 2003-12-31 12:40:02.000000000 +0100
++++ test/scratch.cc 2004-01-24 20:20:12.000000000 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -381,7 +393,7 @@
const char *Tmp = "/usr/include/linux/kerneld.h";
Index: tools/cached_md5.cc
--- tools/cached_md5.cc.orig 2003-12-23 21:16:37.000000000 +0100
-+++ tools/cached_md5.cc 2003-12-31 12:40:02.000000000 +0100
++++ tools/cached_md5.cc 2004-01-24 20:20:12.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -397,7 +409,7 @@
#include <string.h>
Index: tools/genbasedir
--- tools/genbasedir.orig 2003-12-23 21:16:47.000000000 +0100
-+++ tools/genbasedir 2003-12-31 12:40:02.000000000 +0100
++++ tools/genbasedir 2004-01-24 20:20:12.000000000 +0100
@@ -43,7 +43,7 @@
phashstuff()
{
@@ -475,7 +487,7 @@
# vim:ts=4:sw=4
Index: tools/genpkglist.cc
--- tools/genpkglist.cc.orig 2003-12-23 21:16:54.000000000 +0100
-+++ tools/genpkglist.cc 2003-12-31 12:40:02.000000000 +0100
++++ tools/genpkglist.cc 2004-01-24 20:20:12.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -500,7 +512,7 @@
{
Index: tools/gensrclist.cc
--- tools/gensrclist.cc.orig 2003-12-23 21:16:39.000000000 +0100
-+++ tools/gensrclist.cc 2003-12-31 12:40:02.000000000 +0100
++++ tools/gensrclist.cc 2004-01-24 20:20:12.000000000 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 apt.spec
--- openpkg-src/apt/apt.spec 24 Jan 2004 19:13:23 -0000 1.17
+++ openpkg-src/apt/apt.spec 24 Jan 2004 19:25:20 -0000 1.18
@@ -53,8 +53,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030913, ncurses, readline, bzip2, make, gcc,
autoconf
-PreReq: OpenPKG, openpkg >= 20030913, ncurses, readline, bzip2
+BuildPreReq: OpenPKG, openpkg >= 20030913, ncurses, readline, make, gcc, autoconf
+PreReq: OpenPKG, openpkg >= 20030913, ncurses, readline
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
