Hello community,
here is the log from the commit of package zypper
checked in at Thu May 1 15:01:20 CEST 2008.
--------
--- zypper/zypper.changes 2008-04-28 16:55:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2008-04-30 19:00:54.000000000 +0200
@@ -1,0 +2,27 @@
+Wed Apr 30 18:48:16 CEST 2008 - jkupec@suse.cz
+
+- abbreviate package summary in the search to fit screen width
+- r9915
+- 0.11.2
+
+-------------------------------------------------------------------
+Tue Apr 29 22:56:48 CEST 2008 - jkupec@suse.cz
+
+- basic cleanup upon SIGINT and SIGTERM (will remove
+ temporary repos) (bnc #340505)
+- r9893
+
+-------------------------------------------------------------------
+Tue Apr 29 13:41:25 CEST 2008 - jreidinger@suse.cz
+
+- show license in pager (bnc #260883)
+- r9882
+
+-------------------------------------------------------------------
+Tue Apr 29 09:55:24 CEST 2008 - jreidinger@suse.cz
+
+- provide better info for allready installed capabilities.
+ (bnc #384412)
+- r9876
+
+-------------------------------------------------------------------
Old:
----
zypper-0.11.1.tar.bz2
New:
----
zypper-0.11.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.P23885/_old 2008-05-01 15:00:32.000000000 +0200
+++ /var/tmp/diff_new_pack.P23885/_new 2008-05-01 15:00:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.11.1)
+# spec file for package zypper (Version 0.11.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: zypper
-BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 4.16.0 readline-devel >= 5.1
+BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 4.18.0 readline-devel >= 5.1
BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1
Requires: procps
Recommends: logrotate cron
@@ -22,9 +22,9 @@
AutoReqProv: on
PreReq: permissions
Summary: Command Line Package Management Using Libzypp
-Version: 0.11.1
+Version: 0.11.2
Release: 1
-Source: zypper-0.11.1.tar.bz2
+Source: zypper-0.11.2.tar.bz2
Prefix: /usr
Url: http://en.opensuse.org/Zypper
Provides: y2pmsh
@@ -106,6 +106,21 @@
# it from being erased by rpm -e
%ghost %config(noreplace) %{_var}/log/zypper.log
%changelog
+* Wed Apr 30 2008 jkupec@suse.cz
+- abbreviate package summary in the search to fit screen width
+- r9915
+- 0.11.2
+* Wed Apr 30 2008 jkupec@suse.cz
+- basic cleanup upon SIGINT and SIGTERM (will remove
+ temporary repos) (bnc #340505)
+- r9893
+* Tue Apr 29 2008 jreidinger@suse.cz
+- show license in pager (bnc #260883)
+- r9882
+* Tue Apr 29 2008 jreidinger@suse.cz
+- provide better info for allready installed capabilities.
+ (bnc #384412)
+- r9876
* Mon Apr 28 2008 jkupec@suse.cz
- translations update
- 0.11.1
++++++ zypper-0.11.1.tar.bz2 -> zypper-0.11.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/doc/zypper.8 new/zypper-0.11.2/doc/zypper.8
--- old/zypper-0.11.1/doc/zypper.8 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/doc/zypper.8 2008-04-30 19:00:45.000000000 +0200
@@ -679,6 +679,9 @@
Returned by the \fBinstall\fR and the \fBremove\fR command in case any of the
arguments does not match any of the available (or installed) resolvable names
or other capabilities.
+105 - ZYPPER_EXIT_ON_SIGNAL
+Returned upon exiting after receiving a SIGINT or SIGTERM.
+
.SH "COMPATIBILITY WITH RUG"
.LP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/package/zypper.changes new/zypper-0.11.2/package/zypper.changes
--- old/zypper-0.11.1/package/zypper.changes 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/package/zypper.changes 2008-04-30 19:00:45.000000000 +0200
@@ -1,4 +1,31 @@
-------------------------------------------------------------------
+Wed Apr 30 18:48:16 CEST 2008 - jkupec@suse.cz
+
+- abbreviate package summary in the search to fit screen width
+- r9915
+- 0.11.2
+
+-------------------------------------------------------------------
+Tue Apr 29 22:56:48 CEST 2008 - jkupec@suse.cz
+
+- basic cleanup upon SIGINT and SIGTERM (will remove
+ temporary repos) (bnc #340505)
+- r9893
+
+-------------------------------------------------------------------
+Tue Apr 29 13:41:25 CEST 2008 - jreidinger@suse.cz
+
+- show license in pager (bnc #260883)
+- r9882
+
+-------------------------------------------------------------------
+Tue Apr 29 09:55:24 CEST 2008 - jreidinger@suse.cz
+
+- provide better info for allready installed capabilities.
+ (bnc #384412)
+- r9876
+
+-------------------------------------------------------------------
Mon Apr 28 16:54:31 CEST 2008 - jkupec@suse.cz
- translations update
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper.cc new/zypper-0.11.2/src/zypper.cc
--- old/zypper-0.11.1/src/zypper.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper.cc 2008-04-30 19:00:45.000000000 +0200
@@ -62,7 +62,7 @@
: _argc(0), _argv(NULL), _out_ptr(NULL),
_command(ZypperCommand::NONE),
_exit_code(ZYPPER_EXIT_OK),
- _running_shell(false), _running_help(false),
+ _running_shell(false), _running_help(false), _exit_requested(false),
_sh_argc(0), _sh_argv(NULL)
{
MIL << "Hi, me zypper " VERSION " built " << __DATE__ << " " << __TIME__ << endl;
@@ -272,7 +272,7 @@
{"normal-output", no_argument, 0, 0 },
// not implemented currently => ignored
{"terse", no_argument, 0, 't'},
- {"no-abbrev", no_argument, 0, 0 },
+ {"no-abbrev", no_argument, 0, 'A'},
{"table-style", required_argument, 0, 's'},
{"rug-compatible", no_argument, 0, 'r'},
{"non-interactive", no_argument, 0, 'n'},
@@ -642,7 +642,7 @@
else
safeDoCommand();
}
- catch (Exception & e)
+ catch (const Exception & e)
{
out().error(e.msg());
print_unknown_command_hint(*this);
@@ -2578,6 +2578,8 @@
{
// sort by name (can't sort by repo)
t.sort(1);
+ if (!globalOpts().no_abbrev)
+ t.allowAbbrev(2);
}
cout << t; //! \todo out().table()?
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper.h new/zypper-0.11.2/src/zypper.h
--- old/zypper-0.11.1/src/zypper.h 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper.h 2008-04-30 19:00:45.000000000 +0200
@@ -92,6 +92,10 @@
std::listzypp::RepoInfo additional_repos;
int patches_count;
int security_patches_count;
+ /**
+ * Used by requestMedia callback
+ * \todo but now it uses label, remove this variable?
+ */
zypp::RepoInfo current_repo;
std::listzypp::SrcPackage::constPtr srcpkgs_to_install;
@@ -142,10 +146,14 @@
void setExitCode(int exit) { _exit_code = exit; }
bool runningShell() const { return _running_shell; }
bool runningHelp() const { return _running_help; }
-
+ bool exitRequested() const { return _exit_requested; }
+ void requestExit() { _exit_requested = true; }
+
int argc() { return _running_shell ? _sh_argc : _argc; }
char ** argv() { return _running_shell ? _sh_argv : _argv; }
+ void cleanup();
+
public:
~Zypper();
private:
@@ -157,7 +165,6 @@
void shellCleanup();
void safeDoCommand();
void doCommand();
- void cleanup();
void setCommand(const ZypperCommand & command) { _command = command; }
void setRunningShell(bool value = true) { _running_shell = value; }
@@ -179,6 +186,7 @@
int _exit_code;
bool _running_shell;
bool _running_help;
+ bool _exit_requested;
RuntimeData _rdata;
@@ -196,11 +204,6 @@
{
public:
ExitRequestException(const std::string & msg = "") : zypp::Exception(msg) {}
-// ExitRequestException(const std::string & msg = "") : _msg(msg) {}
-
-// const std::string & msg() const { return _msg; }
-private:
-// std::string _msg;
};
#endif /*ZYPPER_H*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-main.cc new/zypper-0.11.2/src/zypper-main.cc
--- old/zypper-0.11.1/src/zypper-main.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-main.cc 2008-04-30 19:00:45.000000000 +0200
@@ -1,4 +1,6 @@
#include <iostream>
+#include
+//#include
#include "zypp/base/Logger.h"
#include "zypp/base/LogControl.h"
@@ -19,6 +21,34 @@
KeyRingCallbacks keyring_callbacks;
DigestCallbacks digest_callbacks;
+
+void signal_handler(int sig)
+{
+ Zypper & zypper = *Zypper::instance();
+ if (zypper.exitRequested())
+ {
+ /*
+ if (zypper.runningShell())
+ {
+ cout << endl << zypp::str::form(
+ _("Use '%s' or enter '%s' to quit the shell."), "Ctrl+D", "quit") << endl;
+ ::rl_reset_after_signal();
+ exit(ZYPPER_EXIT_ON_SIGNAL);
+ //! \todo improve to drop to shell only
+ }
+ else*/
+ {
+ // translators: this will show up if you press ctrl+c twice outside of zypper shell
+ cerr << _("OK OK! Exitting immediately...") << endl;
+ zypper.cleanup();
+ exit(ZYPPER_EXIT_ON_SIGNAL);
+ }
+ }
+ else
+ zypper.requestExit();
+}
+
+
int main(int argc, char **argv)
{
struct Bye {
@@ -38,5 +68,10 @@
logfile = ZYPPER_LOG;
zypp::base::LogControl::instance().logfile( logfile );
+ if (::signal(SIGINT, signal_handler) == SIG_ERR)
+ cerr << "Failed to set SIGINT handler." << endl;
+ if (::signal(SIGTERM, signal_handler) == SIG_ERR)
+ cerr << "Failed to set SIGTERM handler." << endl;
+
return Zypper::instance()->main(argc, argv);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-main.h new/zypper-0.11.2/src/zypper-main.h
--- old/zypper-0.11.1/src/zypper-main.h 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-main.h 2008-04-30 19:00:45.000000000 +0200
@@ -21,6 +21,7 @@
#define ZYPPER_EXIT_INF_REBOOT_NEEDED 102 // reboot needed after install/upgrade
#define ZYPPER_EXIT_INF_RESTART_NEEDED 103 // restart of package manager itself needed
#define ZYPPER_EXIT_INF_CAP_NOT_FOUND 104 // given capability not found (for install/remove)
+#define ZYPPER_EXIT_ON_SIGNAL 105 // SIGINT or SIGTERM received
// undefine _ and _PL macros from libzypp
#ifdef _
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-media-callbacks.h new/zypper-0.11.2/src/zypper-media-callbacks.h
--- old/zypper-0.11.1/src/zypper-media-callbacks.h 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-media-callbacks.h 2008-04-30 19:00:45.000000000 +0200
@@ -80,7 +80,7 @@
// You can also have a look at the regular expressions used to check the answer here:
// /usr/lib/locale//LC_MESSAGES/SYS_LC_MESSAGES
_("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."))
- % gData.current_repo.name() % mediumNr);
+ % label % mediumNr);
if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false))
return MediaChangeReport::RETRY;
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-misc.cc new/zypper-0.11.2/src/zypper-misc.cc
--- old/zypper-0.11.1/src/zypper-misc.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-misc.cc 2008-04-30 19:00:45.000000000 +0200
@@ -3,6 +3,7 @@
#include <sstream>
#include
#include
+#include //for wait()
#include "zypp/ZYppFactory.h"
#include "zypp/base/Logger.h"
@@ -14,6 +15,7 @@
#include "zypp/SrcPackage.h"
#include "zypp/Capabilities.h"
#include "zypp/PoolQuery.h"
+#include "zypp/TmpPath.h"
#include "zypp/media/MediaException.h"
@@ -127,6 +129,53 @@
return true;
}
+//gets true if successfully display in pager
+bool show_in_pager(const string& text)
+{
+ const char* envpager = getenv("PAGER");
+ if (!envpager)
+ envpager="more"; //basic posix default, must be in PATH
+ string pager(envpager);
+ filesystem::TmpFile tfile;
+ string tpath = tfile.path().absolutename().c_str();
+ ofstream os(tpath.c_str());
+ os << text;
+ os.close();
+ ostringstream cmdline;
+ cmdline << pager <<" "<status().isInstalled())
- { installed = true; break; }
+ {
+ installed = true;
+ provider = solvit->resolvable()->name();
+ break; }
// already installed, nothing to do
if (installed && install_not_remove)
{
+ string s = (provider==str) ? str : boost::str(format("%s (%s)")
+ % str % provider);
// translators: meaning a package %s or provider of capability %s
- zypper.out().info(str::form(_("'%s' is already installed."), str.c_str()));
+ zypper.out().info(str::form(_("'%s' is already installed."), s.c_str()));
MIL << str::form("skipping '%s': already installed", str.c_str()) << endl;
continue;
}
@@ -2418,7 +2473,8 @@
s << licenseText;
else
s << processRichText(licenseText);
- zypper.out().info(s.str(), Out::QUIET);
+ if (!show_in_pager(s.str())) //pager fail, show normal
+ zypper.out().info(s.str(), Out::QUIET);
// lincense prompt
string question = _("In order to install this package, you must agree"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-repos.cc new/zypper-0.11.2/src/zypper-repos.cc
--- old/zypper-0.11.1/src/zypper-repos.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-repos.cc 2008-04-30 19:00:45.000000000 +0200
@@ -259,8 +259,8 @@
{
RepoManager manager(zypper.globalOpts().rm_options);
list<RepoInfo> known = manager.knownRepositories();
- bool founded = false;
-
+ bool founded = false;
+
unsigned int number = 1; // repo number
for (list<RepoInfo>::const_iterator known_it = known.begin();
known_it != known.end(); ++known_it, number++)
@@ -283,7 +283,7 @@
catch(const url::UrlException &){}
} // END for all known repos
-
+
return founded;
}
@@ -313,13 +313,13 @@
// repo found
// is it a duplicate? compare by alias and URIs
- //! \todo operator== in RepoInfo?
+ //! \todo operator== in RepoInfo?
bool duplicate = false;
for (list<RepoInfo>::const_iterator repo_it = repos.begin();
repo_it != repos.end(); ++repo_it)
{
bool equals = true;
-
+
// alias
if (repo_it->alias() != repo.alias())
{
@@ -892,12 +892,12 @@
{
string msg = boost::str(
format(_("Skipping disabled repository '%s'")) % repo.name());
-
+
if (specified.empty())
zypper.out().info(msg, Out::HIGH);
else
zypper.out().error(msg);
-
+
enabled_repo_count--;
continue;
}
@@ -1049,7 +1049,7 @@
it != repos.end(); ++it)
{
RepoInfo repo(*it);
-
+
if (!specified.empty())
{
bool found = false;
@@ -1060,7 +1060,7 @@
found = true;
break;
}
-
+
if (!found)
{
DBG << repo.alias() << "(#" << ") not specified,"
@@ -1069,7 +1069,7 @@
continue;
}
}
-
+
try
{
if( clean_metadata )
@@ -1115,7 +1115,8 @@
zypper.out().info(_("Cleaning installed packages cache."), Out::HIGH);
try
{
- manager.cleanTargetCache();
+ init_target(zypper);
+ God->target()->cleanCache();
}
catch (...)
{
@@ -1303,7 +1304,7 @@
repo.setType(RepoType(type));
repo.setAlias(alias.empty() ? timestamp() : alias);
- parsed_opts::const_iterator it = zypper.cOpts().find("name");
+ parsed_opts::const_iterator it = zypper.cOpts().find("name");
if (it != zypper.cOpts().end())
repo.setName(it->second.front());
repo.addBaseUrl(url);
@@ -1519,7 +1520,7 @@
changed_autoref = true;
repo.setAutorefresh(autoref);
}
-
+
int prio = 0;
parsed_opts::const_iterator tmp1;
if ((tmp1 = zypper.cOpts().find("priority")) != zypper.cOpts().end())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-tabulator.cc new/zypper-0.11.2/src/zypper-tabulator.cc
--- old/zypper-0.11.1/src/zypper-tabulator.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-tabulator.cc 2008-04-30 19:00:45.000000000 +0200
@@ -1,5 +1,7 @@
#include <iostream>
#include <cstring>
+#include <cstdlib>
+#include
#include "zypp/base/Logger.h"
@@ -97,7 +99,7 @@
container::const_iterator
i = _columns.begin (),
e = _columns.end ();
-
+
stream.setf (ios::left, ios::adjustfield);
for (unsigned c = 0; i != e ; ++i, ++c) {
if (seen_first) {
@@ -107,14 +109,48 @@
}
seen_first = true;
-// stream.width (widths[c]);// that does not work with multibyte chars
- stream << *i;
- stream.width (widths[c] - string_to_columns (*i));
+ // stream.width (widths[c]); // that does not work with multibyte chars
+ const string & s = *i;
+ if (s.size() > widths[c])
+ stream << (s.substr(0, widths[c] - 2) + "->");
+ else
+ {
+ stream << s;
+ stream.width (widths[c] - string_to_columns (s));
+ }
stream << "";
}
stream << endl;
}
+// ----------------------( Table )---------------------------------------------
+
+Table::Table() :
+ _has_header (false),
+ _max_col (0),
+ _width(0),
+ _style (defaultStyle)
+{
+ //! \todo move this to utils
+
+ const char *cols_env = getenv("COLUMNS");
+ if (cols_env)
+ _screen_width = ::atoi (cols_env);
+ else
+ {
+ ::rl_initialize();
+ //::rl_reset_screen_size();
+ ::rl_get_screen_size (NULL, &_screen_width);
+ DBG << "readline says we have " << _screen_width << " char wide console screen" << endl;
+ }
+
+ // safe default
+ if (!_screen_width)
+ _screen_width = 80;
+
+ DBG << "got screen width of " << _screen_width << endl;
+}
+
void Table::add (const TableRow& tr) {
_rows.push_back (tr);
updateColWidths (tr);
@@ -126,7 +162,17 @@
updateColWidths (tr);
}
+void Table::allowAbbrev(unsigned column) {
+ if (column >= _abbrev_col.size()) {
+ _abbrev_col.reserve(column + 1);
+ _abbrev_col.insert(_abbrev_col.end(), column - _abbrev_col.size() + 1, false);
+ }
+ _abbrev_col[column] = true;
+}
+
void Table::updateColWidths (const TableRow& tr) {
+ _width = -3;
+
TableRow::container::const_iterator
i = tr._columns.begin (),
e = tr._columns.end ();
@@ -141,6 +187,8 @@
if (max < cur)
max = cur;
+
+ _width += max + 3;
}
}
@@ -165,6 +213,18 @@
}
void Table::dumpTo (ostream &stream) const {
+
+ // reset column widths for columns that can be abbreviated
+ //! \todo allow abbrev of multiple columns?
+ unsigned c = 0;
+ for (vector<bool>::const_iterator it = _abbrev_col.begin();
+ it != _abbrev_col.end() && c <= _max_col; ++it, ++c) {
+ if (*it && _width > _screen_width) {
+ _max_width[c] -= _width - _screen_width;
+ break;
+ }
+ }
+
if (_has_header) {
_header.dumpTo (stream, _max_width, _style);
dumpRule (stream);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-tabulator.h new/zypper-0.11.2/src/zypper-tabulator.h
--- old/zypper-0.11.1/src/zypper-tabulator.h 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-tabulator.h 2008-04-30 19:00:45.000000000 +0200
@@ -93,12 +93,10 @@
void style (TableStyle st);
void sort (unsigned by_column); // columns start with 0...
+ void allowAbbrev(unsigned column);
+
+ Table ();
- Table () :
- _has_header (false),
- _max_col (0),
- _style (defaultStyle)
- {}
private:
void dumpRule (ostream &stream) const;
void updateColWidths (const TableRow& tr);
@@ -109,9 +107,15 @@
//! maximum column index seen in this table
unsigned _max_col;
//! maximum width of respective columns
- vector<unsigned> _max_width;
+ mutable vector<unsigned> _max_width;
+ //! table width (columns)
+ int _width;
//! table drawing style
TableStyle _style;
+ //! console screen width as retrieved by readline
+ int _screen_width;
+ //! whether to abbreviate the column if needed
+ vector<bool> _abbrev_col;
};
inline
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/src/zypper-utils.cc new/zypper-0.11.2/src/zypper-utils.cc
--- old/zypper-0.11.1/src/zypper-utils.cc 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/src/zypper-utils.cc 2008-04-30 19:00:45.000000000 +0200
@@ -32,8 +32,9 @@
line_read = NULL;
}
- /* Get a line from the user. */
- line_read = readline ("zypper> ");
+ //::rl_catch_signals = 0;
+ /* Get a line from the user. */
+ line_read = ::readline ("zypper> ");
/* If the line has any text in it,
save it on the history. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/VERSION.cmake new/zypper-0.11.2/VERSION.cmake
--- old/zypper-0.11.1/VERSION.cmake 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/VERSION.cmake 2008-04-30 19:00:45.000000000 +0200
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "11")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.11.1/zypper.spec.cmake new/zypper-0.11.2/zypper.spec.cmake
--- old/zypper-0.11.1/zypper.spec.cmake 2008-04-28 16:55:39.000000000 +0200
+++ new/zypper-0.11.2/zypper.spec.cmake 2008-04-30 19:00:45.000000000 +0200
@@ -11,7 +11,7 @@
# norootforbuild
Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 4.16.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
+BuildRequires: libzypp-devel >= 4.18.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6
Requires: procps
Recommends: logrotate cron
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org