Mailinglist Archive: opensuse-commit (1187 mails)
| < Previous | Next > |
commit rug
- From: root@xxxxxxx (h_root)
- Date: Wed, 5 Apr 2006 01:03:19 +0200 (CEST)
- Message-id: <20060404230319.810758BD67@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package rug
checked in at Wed Apr 5 01:03:19 CEST 2006.
--------
--- rug/rug.changes 2006-04-01 00:09:03.000000000 +0200
+++ rug/rug.changes 2006-04-04 19:51:45.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 4 19:51:18 CEST 2006 - maw@xxxxxxx
+
+- New source drop (r26652) which:
+- Prints dependency information in the patch-info command.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rug.spec ++++++
--- /var/tmp/diff_new_pack.p4HiHM/_old 2006-04-05 01:02:21.000000000 +0200
+++ /var/tmp/diff_new_pack.p4HiHM/_new 2006-04-05 01:02:21.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel
URL: http://www.novell.com
Version: 7.1.1
-Release: 21
+Release: 22
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Command Line Client for zmd
@@ -78,6 +78,9 @@
%_mandir/*/*/*.gz
%changelog -n rug
+* Tue Apr 04 2006 - maw@xxxxxxx
+- New source drop (r26652) which:
+- Prints dependency information in the patch-info command.
* Fri Mar 31 2006 - maw@xxxxxxx
- New source drop (r26568) which:
- Backs out the patch status reporting; it requires changes in
++++++ rug-7.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/aclocal.m4 new/rug-7.1.1/aclocal.m4
--- old/rug-7.1.1/aclocal.m4 2006-02-17 19:19:36.000000000 +0100
+++ new/rug-7.1.1/aclocal.m4 2006-03-29 19:19:11.000000000 +0200
@@ -44,7 +44,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -80,14 +80,30 @@
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
+ fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -109,19 +125,30 @@
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -129,9 +156,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/configure new/rug-7.1.1/configure
--- old/rug-7.1.1/configure 2006-02-17 19:19:43.000000000 +0100
+++ new/rug-7.1.1/configure 2006-03-29 19:19:14.000000000 +0200
@@ -5280,6 +5280,9 @@
echo $ECHO_N "checking for ZMD... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
+ if test -n "$ZMD_CFLAGS"; then
+ pkg_cv_ZMD_CFLAGS="$ZMD_CFLAGS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"zmd-public zmd-package-management-public\"") >&5
($PKG_CONFIG --exists --print-errors "zmd-public zmd-package-management-public") 2>&5
@@ -5290,10 +5293,14 @@
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
+ if test -n "$ZMD_LIBS"; then
+ pkg_cv_ZMD_LIBS="$ZMD_LIBS"
+ else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"zmd-public zmd-package-management-public\"") >&5
($PKG_CONFIG --exists --print-errors "zmd-public zmd-package-management-public") 2>&5
@@ -5304,38 +5311,59 @@
else
pkg_failed=yes
fi
+ fi
else
pkg_failed=untried
fi
+
+
if test $pkg_failed = yes; then
- ZMD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"`
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ZMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"`
+ else
+ ZMD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$ZMD_PKG_ERRORS" 1>&5
+ echo "$ZMD_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (zmd-public zmd-package-management-public) were not met:
+
+$ZMD_PKG_ERRORS
- { { echo "$as_me:$LINENO: error: Package requirements (zmd-public zmd-package-management-public) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&5
-echo "$as_me: error: Package requirements (zmd-public zmd-package-management-public) were not met.
+Alternatively, you may set the environment variables ZMD_CFLAGS
+and ZMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (zmd-public zmd-package-management-public) were not met:
+
+$ZMD_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&2;}
+Alternatively, you may set the environment variables ZMD_CFLAGS
+and ZMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables ZMD_CFLAGS
+and ZMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&5
@@ -5343,9 +5371,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables ZMD_CFLAGS
+and ZMD_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&2;}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/BuildConfig.cs new/rug-7.1.1/src/BuildConfig.cs
--- old/rug-7.1.1/src/BuildConfig.cs 2006-03-31 22:52:00.000000000 +0200
+++ new/rug-7.1.1/src/BuildConfig.cs 2006-04-04 17:04:29.000000000 +0200
@@ -2,10 +2,10 @@
namespace Novell.Zenworks.Rug {
public class BuildConfig {
- public const string PREFIX = "/usr/local";
- public const string SYSCONFDIR = "/usr/local/etc";
- public const string DATADIR = "/usr/local/share";
- public const string LIBDIR = "/usr/local/lib";
+ public const string PREFIX = "/opt/zypp";
+ public const string SYSCONFDIR = "/opt/zypp/etc";
+ public const string DATADIR = "/opt/zypp/share";
+ public const string LIBDIR = "/opt/zypp/lib";
public const string MODULEDIR = LIBDIR + "/rug/modules";
public const string LOCALEDIR = DATADIR + "/locale";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/ChangeLog new/rug-7.1.1/src/ChangeLog
--- old/rug-7.1.1/src/ChangeLog 2006-03-31 22:50:51.000000000 +0200
+++ new/rug-7.1.1/src/ChangeLog 2006-04-04 17:03:52.000000000 +0200
@@ -1,3 +1,13 @@
+2006-04-04 Dan Mills <thunder@xxxxxxxxxx>
+
+ * PackageCommands.cs (FormatDep): Add more dependency target types.
+
+2006-04-03 Dan Mills <thunder@xxxxxxxxxx>
+
+ * PackageCommands.cs: PackageDepsInfo -> ResolvableDepsInfo. Print
+ out dependency information in the patch-info command. Make some
+ strings translatable.
+
2006-03-30 Dan Mills <thunder@xxxxxxxxxx>
* PackageCommands.cs (GetResolvableStatus): Change strings as
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/PackageCommands.cs new/rug-7.1.1/src/PackageCommands.cs
--- old/rug-7.1.1/src/PackageCommands.cs 2006-03-31 22:50:51.000000000 +0200
+++ new/rug-7.1.1/src/PackageCommands.cs 2006-04-04 18:39:47.000000000 +0200
@@ -800,8 +800,8 @@
Error (GetString ("--- No packages found ---"));
foreach (PackageInfo p in pkgs) {
- PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
- if (depInfo.Equals (PackageDepsInfo.Empty))
+ ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
+ if (depInfo.Equals (ResolvableDepsInfo.Empty))
continue;
Console.WriteLine (String.Format ("--- {0} {1} ---", p.Name, p.Version));
@@ -854,9 +854,9 @@
Error (GetString ("--- No packages found ---"));
foreach (PackageInfo p in pkgs) {
- PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
+ ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
- if (depInfo.Equals (PackageDepsInfo.Empty))
+ if (depInfo.Equals (ResolvableDepsInfo.Empty))
continue;
Formatter formatter;
@@ -959,8 +959,8 @@
Error (GetString ("--- No packages found ---"));
foreach (PackageInfo p in pkgs) {
- PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
- if (depInfo.Equals (PackageDepsInfo.Empty))
+ ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
+ if (depInfo.Equals (ResolvableDepsInfo.Empty))
continue;
Formatter formatter = new Formatter (GetString ("Conflict"), GetString ("Provided By"),
@@ -1046,8 +1046,8 @@
Error (GetString ("--- No packages found ---"));
foreach (PackageInfo p in pkgs) {
- PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
- if (depInfo.Equals (PackageDepsInfo.Empty))
+ ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p);
+ if (depInfo.Equals (ResolvableDepsInfo.Empty))
continue;
Formatter formatter = new Formatter (GetString ("Obsoletes"), GetString ("Provided By"),
@@ -2917,7 +2917,45 @@
}
protected static string FormatDep (DepInfo dep) {
- string depString = dep.Name;
+ string depString = "";
+
+ switch (dep.Target) {
+ case ResolvableType.Package:
+ depString += GetString ("package: ");
+ break;
+ case ResolvableType.Script:
+ depString += GetString ("script: ");
+ break;
+ case ResolvableType.Message:
+ depString += GetString ("message: ");
+ break;
+ case ResolvableType.Patch:
+ depString += GetString ("patch: ");
+ break;
+ case ResolvableType.Pattern:
+ depString += GetString ("pattern: ");
+ break;
+ case ResolvableType.Product:
+ depString += GetString ("product: ");
+ break;
+ case ResolvableType.Selection:
+ depString += GetString ("selection: ");
+ break;
+ case ResolvableType.Language:
+ depString += GetString ("language: ");
+ break;
+ case ResolvableType.Atom:
+ depString += GetString ("atom: ");
+ break;
+ case ResolvableType.SrcPackage:
+ depString += GetString ("source: ");
+ break;
+ default:
+ break;
+ }
+
+ depString += dep.Name;
+
if (dep.Relation != "any")
depString += " " + dep.Relation + " " + dep.Version;
@@ -3141,17 +3179,38 @@
Error ("No patch with name '{0}' was found", RemainingArguments[0]);
}
- Console.WriteLine ("Name: " + patch.Name);
- Console.WriteLine ("Version: " + patch.Version);
- Console.WriteLine ("Arch: " + patch.Arch);
- Console.WriteLine ("Status: " + patch.Status);
- Console.WriteLine ("Category: " + patch.Category);
- Console.WriteLine ("Created On: " + patch.CreationTime);
- Console.WriteLine ("Reboot Required: " + GetBooleanString (patch.RebootRequired));
- Console.WriteLine ("Restart Required: " + GetBooleanString (patch.RestartRequired));
- Console.WriteLine ("Interactive: " + GetBooleanString (patch.IsInteractive));
- Console.WriteLine ("Summary: " + patch.Summary);
- Console.WriteLine ("Description: " + patch.Description);
+ Console.WriteLine (GetString ("Name: ") + patch.Name);
+ Console.WriteLine (GetString ("Version: ") + patch.Version);
+ Console.WriteLine (GetString ("Arch: ") + patch.Arch);
+ Console.WriteLine (GetString ("Status: ") + patch.Status);
+ Console.WriteLine (GetString ("Category: ") + patch.Category);
+ Console.WriteLine (GetString ("Created On: ") + patch.CreationTime);
+ Console.WriteLine (GetString ("Reboot Required: ") + GetBooleanString (patch.RebootRequired));
+ Console.WriteLine (GetString ("Restart Required: ") + GetBooleanString (patch.RestartRequired));
+ Console.WriteLine (GetString ("Interactive: ") + GetBooleanString (patch.IsInteractive));
+ Console.WriteLine (GetString ("Summary: ") + patch.Summary);
+ Console.WriteLine (GetString ("Description: ") + patch.Description);
+
+ ResolvableDepsInfo info = PackageManager.GetPatchDependencyInfo (patch);
+ if (info.Provides.Length > 0) {
+ Console.WriteLine (GetString ("Provides:"));
+ ShowPackageDeps (info.Provides);
+ Console.WriteLine ();
+ }
+ if (info.Requires.Length > 0) {
+ Console.WriteLine (GetString ("Requires:"));
+ ShowPackageDeps (info.Requires);
+ Console.WriteLine ();
+ }
+ if (info.Conflicts.Length > 0) {
+ Console.WriteLine (GetString ("Conflicts:"));
+ ShowPackageDeps (info.Conflicts);
+ Console.WriteLine ();
+ }
+ if (info.Obsoletes.Length > 0) {
+ Console.WriteLine (GetString ("Obsoletes:"));
+ ShowPackageDeps (info.Obsoletes);
+ }
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |