0.5.15cnc6-alt17

- apt-utils: Set locale to "C" (#2587).
- apt-utils: Added list of utilities to package description (#3564).
- apt-get: Implemented APT::Get::PrintLocalFile option.

apt-0.5.15cnc6-alt-PrintLocalFile.patch

@@ -0,0 +1,44 @@
+--- apt-0.5.15cnc6/cmdline/apt-get.cc.orig	2005-11-25 16:23:26 +0000
++++ apt-0.5.15cnc6/cmdline/apt-get.cc	2005-11-25 19:12:14 +0000
+@@ -1025,6 +1025,13 @@ bool InstallPackages(CacheFile &Cache,bo
+    // Just print out the uris an exit if the --print-uris flag was used
+    if (_config->FindB("APT::Get::Print-URIs") == true)
+    {
++      if (_config->FindB("APT::Get::PrintLocalFile"))
++      {
++         for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
++            if (((*I)->Local))                                          
++               cout << (*I)->DestFile << endl;
++         return true;
++      }
+       pkgAcquire::UriIterator I = Fetcher.UriBegin();
+       for (; I != Fetcher.UriEnd(); I++)
+ 	 cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+@@ -1719,6 +1726,13 @@ bool DoUpdate(CommandLine &CmdL)
+    // Just print out the uris an exit if the --print-uris flag was used
+    if (_config->FindB("APT::Get::Print-URIs") == true)
+    {
++      if (_config->FindB("APT::Get::PrintLocalFile"))
++      {
++         for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
++            if (((*I)->Local))                                          
++               cout << (*I)->DestFile << endl;
++         return true;
++      }
+       pkgAcquire::UriIterator I = Fetcher.UriBegin();
+       for (; I != Fetcher.UriEnd(); I++)
+ 	 cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
+@@ -2533,6 +2547,13 @@ bool DoSource(CommandLine &CmdL)
+    // Just print out the uris an exit if the --print-uris flag was used
+    if (_config->FindB("APT::Get::Print-URIs") == true)
+    {
++      if (_config->FindB("APT::Get::PrintLocalFile"))
++      {
++         for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I < Fetcher.ItemsEnd(); ++I)
++            if (((*I)->Local))                                          
++               cout << (*I)->DestFile << endl;
++         return true;
++      }
+       pkgAcquire::UriIterator I = Fetcher.UriBegin();
+       for (; I != Fetcher.UriEnd(); I++)
+ 	 cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 

apt-0.5.15cnc6-apt-utils-locale.patch

@@ -0,0 +1,40 @@
+diff -upk.orig apt-0.5.15cnc6.orig/tools/genpkglist.cc apt-0.5.15cnc6/tools/genpkglist.cc
+--- apt-0.5.15cnc6.orig/tools/genpkglist.cc	2003-12-23 18:30:14 +0000
++++ apt-0.5.15cnc6/tools/genpkglist.cc	2005-11-25 21:57:03 +0000
+@@ -13,6 +13,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <locale.h>
+ 
+ #include <map>
+ #include <iostream>
+@@ -464,7 +465,7 @@ int main(int argc, char ** argv) 
+    const char *pkgListSuffix = NULL;
+    bool pkgListAppend = false;
+    
+-   putenv("LC_ALL="); // Is this necessary yet (after i18n was supported)?
++   setlocale(LC_ALL, "C");
+    for (i = 1; i < argc; i++) {
+       if (strcmp(argv[i], "--index") == 0) {
+ 	 i++;
+diff -upk.orig apt-0.5.15cnc6.orig/tools/gensrclist.cc apt-0.5.15cnc6/tools/gensrclist.cc
+--- apt-0.5.15cnc6.orig/tools/gensrclist.cc	2003-12-23 18:30:14 +0000
++++ apt-0.5.15cnc6/tools/gensrclist.cc	2005-11-25 21:56:58 +0000
+@@ -13,6 +13,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <locale.h>
+ 
+ #include <map>
+ #include <list>
+@@ -154,7 +155,7 @@ int main(int argc, char ** argv) 
+    const char *srcListSuffix = NULL;
+    bool srcListAppend = false;
+ 
+-   putenv("LC_ALL="); // Is this necessary yet (after i18n was supported)?
++   setlocale(LC_ALL, "C");
+    for (i = 1; i < argc; i++) {
+       if (strcmp(argv[i], "--mapi") == 0) {
+ 	 mapi = true;

apt.spec

@@ -2,7 +2,7 @@
 
 Name: apt
 Version: 0.5.15cnc6
-Release: alt16
+Release: alt17
 
 Summary: Debian's Advanced Packaging Tool with RPM support
 Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
@@ -52,6 +52,8 @@ Patch38: apt-0.5.15cnc6-alt-dash-cmd.patch
 Patch39: apt-0.5.15cnc6-alt-quiet-update.patch
 Patch40: apt-0.5.15cnc6-alt-vendor.patch
 Patch41: apt-0.5.15cnc6-alt-apt-pipe.patch
+Patch42: apt-0.5.15cnc6-alt-PrintLocalFile.patch
+Patch43: apt-0.5.15cnc6-apt-utils-locale.patch
 
 # Normally not applied, but useful.
 Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
@@ -102,7 +104,7 @@ Obsoletes: libapt-0.5-devel-static
 %package utils
 # Analoguous to rpm-build subpackage.
 Summary: Utilities to create APT repositaries (the indices)
-Summary(ru_RU.KOI8-R): Утилиты для построения APT-репозитариев (индексов)
+Summary(ru_RU.KOI8-R): õÔÉÌÉÔÙ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ APT-ÒÅÐÏÚÉÔÏÒÉÅ× (ÉÎÄÅËÓÏ×)
 Group: Development/Other
 Requires: %name = %version-%release, mktemp >= 1:1.3.1, getopt
 Requires: gnupg, sed
@@ -160,7 +162,7 @@ package manipulation library, modified for RPM.
 %description utils
 This package contains the utility programs that can prepare a repositary of
 RPMS binary and source packages for future access by APT (by generating
-the indices).
+the indices): genbasedir, genpkglist, gensrclist.
 
 It relates to 'apt' package analoguously to how 'rpm' relates to 'rpm-build' package.
 
@@ -195,9 +197,9 @@ This package contains method 'rsync' for APT.
 %risk_usage
 
 %description utils -l ru_RU.KOI8-R
-В этом пакете находятся программы-утилиты, которые могут репозитарий
+÷ ÜÔÏÍ ÐÁËÅÔÅ ÎÁÈÏÄÑÔÓÑ ÐÒÏÇÒÁÍÍÙ-ÕÔÉÌÉÔÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÒÅÐÏÚÉÔÏÒÉÊ
 ÂÉÎÁÒÎÙÈ É ÉÓÈÏÄÎÙÈ ÐÁËÅÔÏ× RPM ÐÒÉÇÏÔÏ×ÉÔØ ÄÌÑ ÄÏÓÔÕÐÁ Ó ÐÏÍÏÝØÀ APT
-(сгенерировать индексы).
+(ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÉÎÄÅËÓÙ): genbasedir, genpkglist, gensrclist.
 
 ïÎ ÏÔÎÏÓÉÔÓÑ Ë ÐÁËÅÔÕ 'apt' ÁÎÁÌÏÇÉÞÎÏ ÔÏÍÕ, ËÁË 'rpm'Ë 'rpm-build'.
 
@@ -245,6 +247,8 @@ This package contains method 'rsync' for APT.
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
+%patch43 -p1
 
 find -type f -name \*.orig -delete -print
 
@@ -266,7 +270,7 @@ popd
 # Fix url.
 %__subst -p 's,/usr/share/common-licenses/GPL,/usr/share/license/GPL,' COPYING
 
-autoreconf -fisv -I buildlib
+autoreconf -fisv
 
 # --disable-dependency-tracking Speeds up one-time builds
 %configure --includedir=%_includedir/apt-pkg %{subst_enable static}
@@ -360,6 +364,11 @@ fi
 # Probably %%doc with README.rsync?
 
 %changelog
+* Fri Nov 25 2005 Dmitry V. Levin <ldv@altlinux.org> 0.5.15cnc6-alt17
+- apt-utils: Set locale to "C" (#2587).
+- apt-utils: Added list of utilities to package description (#3564).
+- apt-get: Implemented APT::Get::PrintLocalFile option.
+
 * Fri Jul 15 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt16
 - apt-shell: -q option for update added
 
@@ -809,7 +818,7 @@ fi
 * Wed Jul 31 2002 Anton V. Denisov <avd@altlinux.ru> 0.5.4cnc4-alt0.1
 - Fixed:
     + apt.conf syntax a little
-    + %doc syntax a little
+    + %%doc syntax a little
 - Updated:
     + APT-0.5.4cnc4
     + BuildRequires
@@ -828,7 +837,7 @@ fi
     + apt-0.5 requires
     + select-genlist.patch for new version
     + Spec file
-    + %doc section
+    + %%doc section
 - Added:
     + Patch for some debug in md5 operations.
     + apt-0.5.4cnc3-alt-configure-version.patch