OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Nov-2006 11:27:25
Branch: HEAD Handle: 2006111410272400
Modified files:
openpkg-src/apt apt.patch apt.spec
Log:
upgrading package: apt 0.5.15.6 -> 0.5.15.3.2
Summary:
Revision Changes Path
1.17 +114 -101 openpkg-src/apt/apt.patch
1.29 +19 -11 openpkg-src/apt/apt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 apt.patch
--- openpkg-src/apt/apt.patch 24 Jan 2004 19:25:20 -0000 1.16
+++ openpkg-src/apt/apt.patch 14 Nov 2006 10:27:24 -0000 1.17
@@ -1,27 +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 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
- Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
-- Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
-+ Cnf.CndSet("Dir::Bin::dpkg","@l_prefix@/bin/dpkg");
-
- return true;
- }
-@@ -187,7 +187,7 @@
- signed Score = 0;
- if
(FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
- Score += 10;
-- if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
-+ if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","@l_prefix@/bin/dpkg")) ==
true)
- Score += 10;
- if (FileExists("/etc/debian_version") == true)
- Score += 10;
Index: apt-pkg/init.cc
---- apt-pkg/init.cc.orig 2003-12-23 21:18:15.000000000 +0100
-+++ apt-pkg/init.cc 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/init.cc.orig 2006-06-22 00:16:15 +0200
++++ apt-pkg/init.cc 2006-11-14 11:21:20 +0100
@@ -45,10 +45,10 @@
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
// CNC:2002-09-10
@@ -50,35 +29,41 @@
Cnf.Set("Dir::Etc::preferences","preferences");
- Cnf.Set("Dir::Bin::methods",LIBDIR "/apt/methods");
+ Cnf.Set("Dir::Bin::methods","@l_prefix@/lib/apt/methods");
- Cnf.Set("Acquire::ComprExtension", ".bz2");
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 2004-01-24 20:20:12.000000000 +0100
-@@ -81,7 +81,7 @@
+--- apt-pkg/luaiface.cc.orig 2006-06-22 00:16:15 +0200
++++ apt-pkg/luaiface.cc 2006-11-14 11:21:20 +0100
+@@ -76,7 +76,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
{
-- _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+- _config->CndSet("Dir::Bin::scripts", PKGDATADIR "/scripts");
+ _config->CndSet("Dir::Bin::scripts", "@l_prefix@/lib/apt/scripts");
const luaL_reg lualibs[] = {
{"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 2004-01-24 20:20:12.000000000 +0100
-@@ -12,6 +12,7 @@
+--- apt-pkg/rpm/rpmhandler.h.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmhandler.h 2006-11-14 11:21:48 +0100
+@@ -10,11 +10,13 @@
+ #ifndef PKGLIB_RPMHANDLER_H
+ #define PKGLIB_RPMHANDLER_H
++#include "config.h"
#include <apt-pkg/fileutl.h>
+ #include <libxml/parser.h>
+ #include <libxml/tree.h>
+ #include <libxml/xmlreader.h>
+#include <rpm/glob.h>
#include <rpm/rpmlib.h>
#include <rpm/rpmmacro.h>
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 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/rpm/rpmpackagedata.cc.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmpackagedata.cc 2006-11-14 11:21:20 +0100
@@ -12,6 +12,7 @@
#include <apti18n.h>
@@ -88,8 +73,8 @@
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 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/rpm/rpmpm.cc.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmpm.cc 2006-11-14 11:21:20 +0100
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
@@ -99,8 +84,8 @@
#include <rpm/rpmdb.h>
#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 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/rpm/rpmpm.h.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmpm.h 2006-11-14 11:21:20 +0100
@@ -11,6 +11,7 @@
#ifndef PKGLIB_rpmPM_H
#define PKGLIB_rpmPM_H
@@ -110,31 +95,31 @@
#if RPM_VERSION >= 0x040100
#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 2004-01-24 20:20:12.000000000 +0100
-@@ -21,6 +21,7 @@
+--- apt-pkg/rpm/rpmrecords.h.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmrecords.h 2006-11-14 11:21:20 +0100
+@@ -19,6 +19,7 @@
+ #pragma interface "apt-pkg/rpmrecords.h"
+ #endif
++#include <rpm/glob.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/fileutl.h>
-+#include <rpm/glob.h>
- #include <rpm/rpmlib.h>
-
-
+ #include <apt-pkg/rpmhandler.h>
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 2004-01-24 20:20:12.000000000 +0100
-@@ -17,6 +17,7 @@
+--- apt-pkg/rpm/rpmsrcrecords.h.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmsrcrecords.h 2006-11-14 11:21:20 +0100
+@@ -15,6 +15,7 @@
+ #pragma interface "apt-pkg/rpmsrcrecords.h"
+ #endif
++#include <rpm/glob.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/fileutl.h>
-+#include <rpm/glob.h>
- #include <rpm/rpmlib.h>
-
-
+ #include <apt-pkg/rpmhandler.h>
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 2004-01-24 20:20:12.000000000 +0100
-@@ -126,13 +126,13 @@
+--- apt-pkg/rpm/rpmsystem.cc.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmsystem.cc 2006-11-14 11:21:20 +0100
+@@ -137,13 +137,13 @@
/* These are the rpm specific configuration variables.. */
bool rpmSystem::Initialize(Configuration &Cnf)
{
@@ -151,8 +136,8 @@
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
-@@ -229,7 +229,7 @@
-
+@@ -244,7 +244,7 @@
+ rpmReadConfigFiles(NULL, NULL);
if (FileExists(RPMDBHandler::DataPath(false)))
Score += 10;
- if (FileExists(Cnf.FindFile("Dir::Bin::rpm","/bin/rpm")) == true)
@@ -161,8 +146,8 @@
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 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/rpm/rpmversion.cc.orig 2006-06-22 00:16:14 +0200
++++ apt-pkg/rpm/rpmversion.cc 2006-11-14 11:21:20 +0100
@@ -22,6 +22,7 @@
#include <apt-pkg/rpmversion.h>
#include <apt-pkg/pkgcache.h>
@@ -172,8 +157,8 @@
#include <rpm/misc.h>
Index: apt-pkg/sourcelist.cc
---- apt-pkg/sourcelist.cc.orig 2003-12-23 21:17:28.000000000 +0100
-+++ apt-pkg/sourcelist.cc 2004-01-24 20:20:12.000000000 +0100
+--- apt-pkg/sourcelist.cc.orig 2006-06-22 00:16:15 +0200
++++ apt-pkg/sourcelist.cc 2006-11-14 11:21:20 +0100
@@ -105,7 +105,7 @@
// Check for an absolute dists specification.
if (Dist.empty() == false && Dist[Dist.size() - 1] == '/')
@@ -184,9 +169,9 @@
Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
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 2004-01-24 20:20:12.000000000 +0100
-@@ -3672,7 +3672,7 @@
+--- cmdline/apt-shell.cc.orig 2006-06-22 00:16:19 +0200
++++ cmdline/apt-shell.cc 2006-11-14 11:21:20 +0100
+@@ -3769,7 +3769,7 @@
" remove - Remove packages\n"
" keep - Keep packages\n"
" upgrade - Perform a global upgrade\n"
@@ -195,7 +180,7 @@
" build-dep - Install build-dependencies for source packages\n"
// " dselect-upgrade - Follow dselect selections\n"
" update - Retrieve new lists of packages\n"
-@@ -3694,8 +3694,7 @@
+@@ -3791,8 +3791,7 @@
" autoclean - Erase old downloaded archive files\n"
"\n"
"For more information type \"help <cmd>\" or \"<cmd> [-h|--help]\".\n"
@@ -206,8 +191,8 @@
}
Index: configure.in
---- configure.in.orig 2003-12-23 21:15:40.000000000 +0100
-+++ configure.in 2004-01-24 20:21:50.000000000 +0100
+--- configure.in.orig 2006-06-22 00:16:21 +0200
++++ configure.in 2006-11-14 11:21:20 +0100
@@ -47,7 +47,7 @@
dnl Check for RPM version
@@ -247,12 +232,28 @@
fi
AC_MSG_CHECKING(for RPM libraries)
AC_MSG_RESULT($RPMLIBS)
+Index: configure
+--- configure.orig 2006-06-22 00:16:21 +0200
++++ configure 2006-11-14 11:21:20 +0100
+@@ -24222,6 +24222,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <netdb.h>
++#ifdef h_errno
++h_errno
++#endif
++#ifdef h_errno
++h_errno
++#endif
+
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
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 @@
+--- lua/Makefile.in.orig 2006-06-22 00:16:09 +0200
++++ lua/Makefile.in 2006-11-14 11:21:20 +0100
+@@ -248,7 +248,7 @@
+ luac_luac_SOURCES = luac/luac.c luac/print.c lopcodes.c
luac_luac_CFLAGS = -DLUA_OPNAMES
-
liblua_la_CFLAGS = -DUSE_DLOPEN -DWITH_POSIX
-liblua_la_LIBADD = -lm -ldl
+liblua_la_LIBADD = -lm
@@ -260,8 +261,8 @@
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
+--- lua/local/lrexlib.c.orig 2006-06-22 00:16:07 +0200
++++ lua/local/lrexlib.c 2006-11-14 11:21:20 +0100
@@ -20,6 +20,7 @@
#ifdef WITH_POSIX
@@ -269,10 +270,10 @@
+#include <sys/types.h>
#include <regex.h>
- static int rex_comp(lua_State *L) {
+ static int posix_comp(lua_State *L) {
Index: methods/gpg.cc
---- methods/gpg.cc.orig 2003-12-23 21:24:04.000000000 +0100
-+++ methods/gpg.cc 2004-01-24 20:20:12.000000000 +0100
+--- methods/gpg.cc.orig 2006-06-22 00:16:16 +0200
++++ methods/gpg.cc 2006-11-14 11:21:20 +0100
@@ -10,6 +10,11 @@
#include <stdio.h>
#include <sys/wait.h>
@@ -368,9 +369,9 @@
char *getFileSigner(const char *file, const char *sigfile,
const char *outfile, string &signerKeyID)
Index: methods/http.cc
---- methods/http.cc.orig 2003-12-23 21:24:14.000000000 +0100
-+++ methods/http.cc 2004-01-24 20:20:12.000000000 +0100
-@@ -680,7 +680,7 @@
+--- methods/http.cc.orig 2006-06-22 00:16:16 +0200
++++ methods/http.cc 2006-11-14 11:21:20 +0100
+@@ -707,7 +707,7 @@
// CNC:2003-01-29
string UserAgent = _config->Find("Acquire::http::User-Agent");
if (UserAgent.empty() == true)
@@ -380,8 +381,8 @@
if (Debug == true)
Index: test/scratch.cc
---- test/scratch.cc.orig 2003-12-23 21:13:20.000000000 +0100
-+++ test/scratch.cc 2004-01-24 20:20:12.000000000 +0100
+--- test/scratch.cc.orig 2006-06-22 00:16:04 +0200
++++ test/scratch.cc 2006-11-14 11:21:20 +0100
@@ -51,7 +51,7 @@
/* Db.GetFLCache().BeginDiverLoad();
@@ -392,8 +393,8 @@
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 2004-01-24 20:20:12.000000000 +0100
+--- tools/cached_md5.cc.orig 2006-06-22 00:16:12 +0200
++++ tools/cached_md5.cc 2006-11-14 11:21:20 +0100
@@ -1,11 +1,11 @@
/*
* $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
@@ -407,10 +408,22 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
+Index: tools/countpkglist.cc
+--- tools/countpkglist.cc.orig 2006-06-22 00:16:12 +0200
++++ tools/countpkglist.cc 2006-11-14 11:21:20 +0100
+@@ -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: tools/genbasedir
---- tools/genbasedir.orig 2003-12-23 21:16:47.000000000 +0100
-+++ tools/genbasedir 2004-01-24 20:20:12.000000000 +0100
-@@ -43,7 +43,7 @@
+--- tools/genbasedir.orig 2006-06-22 00:16:12 +0200
++++ tools/genbasedir 2006-11-14 11:21:20 +0100
+@@ -46,7 +46,7 @@
phashstuff()
{
size=`getsize $1`
@@ -419,7 +432,7 @@
echo " $md5 $size $2"
}
-@@ -171,7 +171,7 @@
+@@ -183,7 +183,7 @@
rm -f $comps; touch $comps
for dir in $topdir/RPMS.* $topdir/SRPMS.* $topdir/../SRPMS.*; do
if [ -d $dir ]; then
@@ -428,19 +441,19 @@
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
-@@ -318,9 +318,9 @@
+@@ -330,9 +330,9 @@
fi
if [ $mapi -ne 0 ]; then
@@ -452,7 +465,7 @@
fi
if [ -z "$meta" -a -f $basedir/srclist.$comp ]; then
-@@ -424,14 +424,14 @@
+@@ -449,14 +449,14 @@
if [ $partial -eq 0 ]; then
echo -n "Updating global release file... "
sed -n -e "/^MD5Sum:/q" \
@@ -469,7 +482,7 @@
-e "p" $release.old > $release.pre
for comp in $components; do
sed -e "\#^ .* $pkglist_.$comp\(.bz2\)\?\$#d" \
-@@ -452,7 +452,7 @@
+@@ -477,7 +477,7 @@
echo "Label: Unknown" >> $release
echo "Suite: Unknown" >> $release
echo "Codename: Unknown" >> $release
@@ -478,7 +491,7 @@
echo "Architectures: Unknown" >> $release
echo "Components: $components" >> $release
echo "Description: Not available" >> $release
-@@ -591,6 +591,4 @@
+@@ -616,6 +616,4 @@
rm -f $basedir/hashfile.gpg.old
fi
@@ -486,8 +499,8 @@
-
# vim:ts=4:sw=4
Index: tools/genpkglist.cc
---- tools/genpkglist.cc.orig 2003-12-23 21:16:54.000000000 +0100
-+++ tools/genpkglist.cc 2004-01-24 20:20:12.000000000 +0100
+--- tools/genpkglist.cc.orig 2006-06-22 00:16:12 +0200
++++ tools/genpkglist.cc 2006-11-14 11:21:20 +0100
@@ -1,11 +1,11 @@
/*
* $Id: genpkglist.cc,v 1.7 2003/01/30 17:18:21 niemeyer Exp $
@@ -501,7 +514,7 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
-@@ -369,7 +369,7 @@
+@@ -386,7 +386,7 @@
}
int scandir(const char * dir, struct dirent *** namelist,
@@ -511,8 +524,8 @@
{
Index: tools/gensrclist.cc
---- tools/gensrclist.cc.orig 2003-12-23 21:16:39.000000000 +0100
-+++ tools/gensrclist.cc 2004-01-24 20:20:12.000000000 +0100
+--- tools/gensrclist.cc.orig 2006-06-22 00:16:12 +0200
++++ tools/gensrclist.cc 2006-11-14 11:21:20 +0100
@@ -1,11 +1,11 @@
/*
* $Id: gensrclist.cc,v 1.8 2003/01/30 17:18:21 niemeyer Exp $
@@ -526,7 +539,7 @@
#include <rpm/rpmlib.h>
#include <stdlib.h>
#include <string.h>
-@@ -134,6 +134,89 @@
+@@ -140,6 +140,89 @@
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apt/apt.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 apt.spec
--- openpkg-src/apt/apt.spec 13 Oct 2006 17:26:47 -0000 1.28
+++ openpkg-src/apt/apt.spec 14 Nov 2006 10:27:24 -0000 1.29
@@ -24,12 +24,12 @@
# package version
%define V_base 0.5.15
-%define V_rev 6
+%define V_rev 3.2
# package information
Name: apt
Summary: Advanced Packaging Tool
-URL: https://moin.conectiva.com.br/AptRpm
+URL: http://apt-rpm.org/
Vendor: Jason Gunthorpe et al.
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
@@ -37,10 +37,10 @@
Group: Bootstrapping
License: GPL
Version: %{V_base}.%{V_rev}
-Release: 20061013
+Release: 20061114
# list of sources
-Source0:
http://moin.conectiva.com.br/files/AptRpm/attachments/apt-%{V_base}cnc%{V_rev}.tar.bz2
+Source0: http://apt-rpm.org/releases/apt-%{V_base}lorg%{V_rev}.tar.bz2
Source1: apt.conf
Source2: sources.list
Source3: vendors.list
@@ -67,15 +67,13 @@
%track
prog apt = {
- disabled
- comment = "rse: vcheck does not support HTTPS and HTTP access is
not possible"
- version = %{V_base}cnc%{V_rev}
- url = http://moin.conectiva.com.br/AptRpm
- regex = apt-(__VER__)\.tar\.bz2
+ version = %{V_base}lorg%{V_rev}
+ url = http://apt-rpm.org/releases/
+ regex = apt-(__VER__lorg__VER__)\.tar\.bz2
}
%prep
- %setup -q -n apt-%{V_base}cnc%{V_rev}
+ %setup -q -n apt-%{V_base}lorg%{V_rev}
%patch -p0
# replace hard-coded paths with OpenPKG ones
@@ -121,6 +119,16 @@
-e 's;^CATALOGS =.*$;CATALOGS =;g' \
po/Makefile
+ # disable some libtool specials
+ %{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}
@@ -168,7 +176,7 @@
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%config %{l_prefix}/etc/apt/apt.conf' \
+ '%config %{l_prefix}/etc/apt/apt.conf*' \
'%config %{l_prefix}/etc/apt/rpmpriorities' \
'%config %{l_prefix}/etc/apt/preferences' \
'%config %{l_prefix}/etc/apt/*.list'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
