0.5.15cnc6-alt9
- apt-shell: ls -G redo (rider@)
This commit is contained in:
Sergey Bolshakov
parent
6432ae509e
commit
640336b9a5
@ -1,6 +1,6 @@
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe.c
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-pipe.c 1970-01-01 03:00:00 +0300
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-pipe.c 2005-04-29 13:13:20 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-pipe.c 2005-05-04 13:26:03 +0400
|
||||
@@ -0,0 +1,381 @@
|
||||
+/* ----------------------------------------------------------------------------
|
||||
+ $Id: apt-pipe.c,v 1.3 2005/03/20 20:56:03 me Exp $
|
||||
@ -384,8 +384,8 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-pipe.c apt-0.5.15cnc6/cmdline/apt-pipe
|
||||
+ return i;
|
||||
+}
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-shell.cc
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-04-29 12:44:47 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-04-29 13:18:52 +0400
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-05-04 13:25:18 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-05-04 13:26:03 +0400
|
||||
@@ -1,4 +1,4 @@
|
||||
-// -*- mode: cpp; mode: fold -*-
|
||||
+// -*- mode: c++; mode: folding -*-
|
||||
@ -403,7 +403,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
#include <fnmatch.h>
|
||||
/*}}}*/
|
||||
|
||||
@@ -3707,9 +3709,7 @@
|
||||
@@ -3711,9 +3713,7 @@
|
||||
return true;
|
||||
return _error->Error(_("No packages found"));
|
||||
}
|
||||
@ -414,7 +414,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
|
||||
// ShowHelp - Show a help screen /*{{{*/
|
||||
// ---------------------------------------------------------------------
|
||||
@@ -4086,6 +4086,7 @@
|
||||
@@ -4090,6 +4090,7 @@
|
||||
}
|
||||
/*}}}*/
|
||||
|
||||
@ -422,7 +422,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
// ReadLine* - readline library stuff /*{{{*/
|
||||
// ---------------------------------------------------------------------
|
||||
/* */
|
||||
@@ -4253,6 +4254,7 @@
|
||||
@@ -4257,6 +4258,7 @@
|
||||
write_history(History.c_str());
|
||||
}
|
||||
/*}}}*/
|
||||
@ -430,7 +430,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
|
||||
CommandLine::Args *CommandArgs(const char *Name)
|
||||
{
|
||||
@@ -4373,6 +4375,134 @@
|
||||
@@ -4377,6 +4379,134 @@
|
||||
}
|
||||
}
|
||||
/*}}}*/
|
||||
@ -565,7 +565,7 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
int main(int argc,const char *argv[])
|
||||
{
|
||||
CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate},
|
||||
@@ -4591,5 +4721,5 @@
|
||||
@@ -4595,5 +4725,5 @@
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -574,8 +574,8 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
// vim:sts=3:sw=3
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc.orig apt-0.5.15cnc6/cmdline/apt-shell.cc.orig
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/Makefile.am apt-0.5.15cnc6/cmdline/Makefile.am
|
||||
--- apt-0.5.15cnc6-orig/cmdline/Makefile.am 2005-04-29 12:44:47 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/Makefile.am 2005-04-29 12:45:37 +0400
|
||||
--- apt-0.5.15cnc6-orig/cmdline/Makefile.am 2005-05-04 13:25:18 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/Makefile.am 2005-05-04 13:26:03 +0400
|
||||
@@ -4,7 +4,7 @@
|
||||
bin_PROGRAMS = apt-get apt-cache apt-cdrom apt-config
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-shell.cc
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-04-29 12:41:14 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-04-29 12:41:58 +0400
|
||||
--- apt-0.5.15cnc6-orig/cmdline/apt-shell.cc 2005-05-04 13:22:13 +0400
|
||||
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc 2005-05-04 13:23:12 +0400
|
||||
@@ -3500,8 +3500,11 @@
|
||||
|
||||
bool ShowVersion = _config->FindB("APT::Cache::ShowVersion", false);
|
||||
@ -32,31 +32,37 @@ diff -uNr apt-0.5.15cnc6-orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-sh
|
||||
int StrLen;
|
||||
unsigned int K;
|
||||
for (unsigned int Line = 0; Line != NumLines; Line++) {
|
||||
@@ -3631,13 +3639,20 @@
|
||||
@@ -3631,13 +3639,24 @@
|
||||
break;
|
||||
pkgCache::PkgIterator Pkg(Cache,Cache.List[Matches[K]]);
|
||||
Str = Pkg.Name();
|
||||
+ PkgSection = Pkg.Section();
|
||||
StrLen = strlen(Str);
|
||||
- if (Len < ColumnLen-1)
|
||||
+ if (Len < ColumnLen-1 && !ShowGroup)
|
||||
c2out << Str << Blank+StrLen;
|
||||
else
|
||||
- c2out << Str << Blank+StrLen;
|
||||
- else
|
||||
- c2out << Str << " ";
|
||||
+ {
|
||||
+ if (ShowGroup)
|
||||
+ string status = "available";
|
||||
+ if (Pkg->CurrentVer != 0) status = "installed";
|
||||
+ if (Pkg->CurrentVer != 0 && Cache[Pkg].Upgradable() == true) status = "upgradable";
|
||||
+ if (Cache[Pkg].NewInstall()) status = "be-installed";
|
||||
+ if (Cache[Pkg].Delete()) status = "be-removed";
|
||||
+ if (Cache[Pkg].Upgrade() == true && Cache[Pkg].NewInstall() != true) status = "be-upgraded";
|
||||
+ if (ShowGroup)
|
||||
+ c2out << PkgSection << "\t" << Str << endl;
|
||||
+ else
|
||||
+ c2out << Str << " ";
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ c2out << Str;
|
||||
+ if (strlen(MatchSection) > 0)
|
||||
+ cout << "\t" << status;
|
||||
+ cout << endl;
|
||||
+ }
|
||||
}
|
||||
- c2out << endl;
|
||||
+ if (!ShowGroup)
|
||||
+ c2out << endl;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4313,6 +4328,8 @@
|
||||
@@ -4313,6 +4332,8 @@
|
||||
{'i',"installed","APT::Cache::ShowInstalled",0},
|
||||
{'v',"version","APT::Cache::ShowVersion",0},
|
||||
{'s',"summary","APT::Cache::ShowSummary",0},
|
||||
|
||||
57
apt.spec
57
apt.spec
@ -1,8 +1,8 @@
|
||||
# $Id: apt,v 1.8 2005/04/29 09:53:57 me Exp $
|
||||
# $Id: apt,v 1.9 2005/05/04 09:29:39 me Exp $
|
||||
|
||||
Name: apt
|
||||
Version: 0.5.15cnc6
|
||||
Release: alt8
|
||||
Release: alt9
|
||||
|
||||
Summary: Debian's Advanced Packaging Tool with RPM support
|
||||
Summary(ru_RU.KOI8-R): Debian APT - õÓÏ×ÅÒÛÅÎÓÔ×Ï×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ Ó ÐÏÄÄÅÒÖËÏÊ RPM
|
||||
@ -74,29 +74,6 @@ BuildPreReq: cvs
|
||||
# all the rest.
|
||||
BuildPreReq: gcc-c++ libreadline-devel libstdc++-devel libtinfo-devel setproctitle-devel
|
||||
|
||||
%define risk_usage_en This package is still under development.
|
||||
|
||||
%description
|
||||
A port of Debian's APT tools for RPM based distributions,
|
||||
or at least for Conectiva. It provides the apt-get utility that
|
||||
provides a simpler, safer way to install and upgrade packages.
|
||||
APT features complete installation ordering, multiple source
|
||||
capability and several other unique features.
|
||||
|
||||
%risk_usage_en
|
||||
|
||||
%define risk_usage äÁÎÎÙÊ ÐÁËÅÔ ÐÏËÁ ÅÝÅ ÎÁÈÏÄÉÔÓÑ × ÓÔÁÄÉÉ ÒÁÚÒÁÂÏÔËÉ.
|
||||
|
||||
%description -l ru_RU.KOI8-R
|
||||
ðÅÒÅÎÅÓÅÎÎÙÅ ÉÚ Debian ÓÒÅÄÓÔ×Á ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ APT, ×ËÌÀÞÁÀÝÉÅ
|
||||
× ÓÅÂÑ ÐÏÄÄÅÒÖËÕ RPM, ×ÙÐÏÌÎÅÎÎÕÀ ËÏÍÐÁÎÉÅÊ Conectiva (âÒÁÚÉÌÉÑ).
|
||||
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÕ apt-get ÄÌÑ ÐÒÏÓÔÏÊ É ÎÁÄÅÖÎÏÊ ÕÓÔÁÎÏ×ËÉ
|
||||
É ÏÂÎÏ×ÌÅÎÉÑ ÐÁËÅÔÏ×. APT ÕÍÅÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÒÁÚÒÅÛÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ
|
||||
ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÏÂÅÓÐÅÞÉ×ÁÅÔ ÕÓÔÁÎÏ×ËÕ ÉÚ ÎÅÓËÏÌØËÉÈ ÉÓÔÏÞÎÉËÏ× É
|
||||
ÃÅÌÙÊ ÒÑÄ ÄÒÕÇÉÈ ÕÎÉËÁÌØÎÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ.
|
||||
|
||||
%risk_usage
|
||||
|
||||
%package -n libapt
|
||||
Summary: APT's core libraries
|
||||
Group: System/Libraries
|
||||
@ -133,6 +110,30 @@ Group: Development/Other
|
||||
Requires: %name = %version-%release, rsync >= 2.5.5-alt3
|
||||
Obsoletes: apt-0.5-rsync
|
||||
|
||||
# {{{ descriptions
|
||||
%define risk_usage_en This package is still under development.
|
||||
|
||||
%description
|
||||
A port of Debian's APT tools for RPM based distributions,
|
||||
or at least for Conectiva. It provides the apt-get utility that
|
||||
provides a simpler, safer way to install and upgrade packages.
|
||||
APT features complete installation ordering, multiple source
|
||||
capability and several other unique features.
|
||||
|
||||
%risk_usage_en
|
||||
|
||||
%define risk_usage äÁÎÎÙÊ ÐÁËÅÔ ÐÏËÁ ÅÝÅ ÎÁÈÏÄÉÔÓÑ × ÓÔÁÄÉÉ ÒÁÚÒÁÂÏÔËÉ.
|
||||
|
||||
%description -l ru_RU.KOI8-R
|
||||
ðÅÒÅÎÅÓÅÎÎÙÅ ÉÚ Debian ÓÒÅÄÓÔ×Á ÕÐÒÁ×ÌÅÎÉÑ ÐÁËÅÔÁÍÉ APT, ×ËÌÀÞÁÀÝÉÅ
|
||||
× ÓÅÂÑ ÐÏÄÄÅÒÖËÕ RPM, ×ÙÐÏÌÎÅÎÎÕÀ ËÏÍÐÁÎÉÅÊ Conectiva (âÒÁÚÉÌÉÑ).
|
||||
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÕ apt-get ÄÌÑ ÐÒÏÓÔÏÊ É ÎÁÄÅÖÎÏÊ ÕÓÔÁÎÏ×ËÉ
|
||||
É ÏÂÎÏ×ÌÅÎÉÑ ÐÁËÅÔÏ×. APT ÕÍÅÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÒÁÚÒÅÛÁÔØ ÚÁ×ÉÓÉÍÏÓÔÉ
|
||||
ÐÒÉ ÕÓÔÁÎÏ×ËÅ, ÏÂÅÓÐÅÞÉ×ÁÅÔ ÕÓÔÁÎÏ×ËÕ ÉÚ ÎÅÓËÏÌØËÉÈ ÉÓÔÏÞÎÉËÏ× É
|
||||
ÃÅÌÙÊ ÒÑÄ ÄÒÕÇÉÈ ÕÎÉËÁÌØÎÙÈ ×ÏÚÍÏÖÎÏÓÔÅÊ.
|
||||
|
||||
%risk_usage
|
||||
|
||||
%description -n libapt
|
||||
This package contains APT's package manipulation library,
|
||||
modified for RPM.
|
||||
@ -202,6 +203,8 @@ This package contains method 'rsync' for APT.
|
||||
|
||||
%risk_usage
|
||||
|
||||
# }}}
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch9 -p1
|
||||
@ -345,6 +348,9 @@ fi
|
||||
# Probably %%doc with README.rsync?
|
||||
|
||||
%changelog
|
||||
* Wed May 4 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt9
|
||||
- apt-shell: ls -G redo (rider@)
|
||||
|
||||
* Thu Apr 28 2005 Sergey Bolshakov <sbolshakov@altlinux.ru> 0.5.15cnc6-alt8
|
||||
- belarusian translation updated
|
||||
- apt-shell: ls -g/-G implemented (rider@)
|
||||
@ -806,6 +812,7 @@ fi
|
||||
|
||||
# Local Variables:
|
||||
# mode: rpm-spec
|
||||
# mode: folding
|
||||
# coding: koi8-r
|
||||
# compile-command: "rpmbuild -ba --target=i586 apt.spec"
|
||||
# End:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user