commit yast2-wagon for openSUSE:Factory
Hello community,
here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at 2011-11-16 17:23:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-wagon (Old)
and /work/SRC/openSUSE:Factory/.yast2-wagon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-wagon", Maintainer is "lslezak@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-wagon/yast2-wagon.changes 2011-09-23 12:53:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-wagon.new/yast2-wagon.changes 2011-11-16 17:23:57.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 16 11:47:43 CET 2011 - jsuchome@suse.cz
+
+- merged texts from proofreading
+- 2.22.0
+
+-------------------------------------------------------------------
Old:
----
yast2-wagon-2.21.6.tar.bz2
New:
----
yast2-wagon-2.22.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-wagon.spec ++++++
--- /var/tmp/diff_new_pack.qjdB08/_old 2011-11-16 17:23:58.000000000 +0100
+++ /var/tmp/diff_new_pack.qjdB08/_new 2011-11-16 17:23:58.000000000 +0100
@@ -19,16 +19,14 @@
Name: yast2-wagon
-Version: 2.21.6
-Release: 1
+Version: 2.22.0
+Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-wagon-2.21.6.tar.bz2
-
-Prefix: /usr
+Source0: yast2-wagon-%{version}.tar.bz2
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
Requires: yast2-online-update-frontend >= 2.17.9
@@ -74,26 +72,26 @@
through command line tools.
%prep
-%setup -n yast2-wagon-2.21.6
+%setup -n yast2-wagon-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -115,8 +113,8 @@
/usr/share/YaST2/modules/*.pm
%dir /usr/share/YaST2/include/wagon
/usr/share/YaST2/include/wagon/*.ycp
-%{prefix}/share/applications/YaST2/*.desktop
-%doc %{prefix}/share/doc/packages/yast2-wagon
+%{_prefix}/share/applications/YaST2/*.desktop
+%doc %{_prefix}/share/doc/packages/yast2-wagon
%exclude %{_datadir}/YaST2/control
%exclude %{_datadir}/YaST2/control/*.xml
@@ -130,7 +128,7 @@
Provides: wagon-control-file
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
Conflicts: otherproviders(wagon-control-file)
Supplements: packageand(yast2-wagon:branding-openSUSE)
@@ -159,7 +157,7 @@
Provides: wagon-control-file
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
# Prevent from crashes (BNC #551613)
Requires: yast2-registration >= 2.18.0
++++++ yast2-wagon-2.21.6.tar.bz2 -> yast2-wagon-2.22.0.tar.bz2 ++++++
++++ 1871 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/Makefile.am new/yast2-wagon-2.22.0/Makefile.am
--- old/yast2-wagon-2.21.6/Makefile.am 2011-09-14 15:24:01.000000000 +0200
+++ new/yast2-wagon-2.22.0/Makefile.am 2011-11-16 11:24:38.000000000 +0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/VERSION new/yast2-wagon-2.22.0/VERSION
--- old/yast2-wagon-2.21.6/VERSION 2011-09-14 15:23:13.000000000 +0200
+++ new/yast2-wagon-2.22.0/VERSION 2011-11-16 11:40:08.000000000 +0100
@@ -1 +1 @@
-2.21.6
+2.22.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/configure.in new/yast2-wagon-2.22.0/configure.in
--- old/yast2-wagon-2.21.6/configure.in 2011-09-14 15:24:01.000000000 +0200
+++ new/yast2-wagon-2.22.0/configure.in 2011-11-16 11:24:38.000000000 +0100
@@ -1,6 +1,6 @@
dnl configure.in for yast2-wagon
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-wagon, 2.21.6, http://bugs.opensuse.org/, yast2-wagon)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/src/clients/wagon.ycp new/yast2-wagon-2.22.0/src/clients/wagon.ycp
--- old/yast2-wagon-2.21.6/src/clients/wagon.ycp 2011-06-30 16:22:47.000000000 +0200
+++ new/yast2-wagon-2.22.0/src/clients/wagon.ycp 2011-11-16 11:39:43.000000000 +0100
@@ -169,8 +169,9 @@
y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2",
Wagon::products_before_migration, Wagon::migration_products);
- Report::Warning (_("Cannot revert the previous state of installed products.
-You will have to revert them manually."));
+ Report::Warning (_("Cannot revert to the previous state of installed products.
+You will have to revert manually.
+"));
return false;
}
@@ -266,7 +267,8 @@
if (Pkg::TargetRemove (package_name) != true) {
y2error ("Cannot remove package %1", package_name);
Report::Error (sformat(_("Cannot remove product %1.
-Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name));
+Remove package %2 manually.
+"), remove_product["name"]:_("Unknown product"), package_name));
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/src/clients/wagon_congratulate.ycp new/yast2-wagon-2.22.0/src/clients/wagon_congratulate.ycp
--- old/yast2-wagon-2.21.6/src/clients/wagon_congratulate.ycp 2010-03-24 08:23:28.000000000 +0100
+++ new/yast2-wagon-2.22.0/src/clients/wagon_congratulate.ycp 2011-11-16 11:39:43.000000000 +0100
@@ -37,12 +37,13 @@
y2warning ("Using fallback migration_congratulate text");
text =
_("<p><b>Congratulations!</b><br>
-You have just successfully finished the on-line migration.</p>
+You have successfully finished the on-line migration.</p>
<p>The whole system has been upgraded. It should be rebooted
-it as soon as possible.</p>
+as soon as possible.</p>
<p>Please visit us at http://www.novell.com/linux/.</p>
<p>Have a nice day!<br>
-Your SUSE Linux Team</p>");
+Your SUSE Linux Team</p>
+");
}
term contents = `VBox (
@@ -58,8 +59,9 @@
`VSpacing (2)
);
- string help = _("<p><b>Finish</b> will close the migration
-and you should restart the system as soon as possible.</b>");
+ string help = _("<p><b>Finish</b> will close the migration.
+Restart the system as soon as possible.</b>
+");
Wizard::SetContents (caption, contents, help,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/src/clients/wagon_dup_repositories.ycp new/yast2-wagon-2.22.0/src/clients/wagon_dup_repositories.ycp
--- old/yast2-wagon-2.21.6/src/clients/wagon_dup_repositories.ycp 2011-08-01 14:04:03.000000000 +0200
+++ new/yast2-wagon-2.22.0/src/clients/wagon_dup_repositories.ycp 2011-11-16 11:39:43.000000000 +0100
@@ -64,7 +64,7 @@
);
// help text
- string help_text = "<p>" + _("Here select the repositories which will be used for migration.")
+ string help_text = "<p>" + _("Select the repositories which will be used for migration.")
+ "</p><p>" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
@@ -184,9 +184,9 @@
// help text
string help_text = "<p>" + _("Select the requested migration type.")
// help text
- + "</p><p>" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest version available in any enabled repository. Full migration might use third party repositories.")
+ + "</p><p>" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest versions available in any enabled repository. Full migration might use third party repositories.")
// help text
- + "</p><p>" + _("Press <b>Advanced</b> button to manually select the repositories used for upgrading.") + "</p>";
+ + "</p><p>" + _("Press <b>Advanced</b> to manually select the repositories used for upgrading.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
@@ -244,7 +244,7 @@
else
{
// error popup message
- Popup::Error(sformat(_("Selected unknown migration type: %1"), mtype));
+ Popup::Error(sformat(_("Selected unknown migration type: %1."), mtype));
y2error("Unknown migratinon type: %1", mtype);
continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/src/clients/wagon_migration_products.ycp new/yast2-wagon-2.22.0/src/clients/wagon_migration_products.ycp
--- old/yast2-wagon-2.21.6/src/clients/wagon_migration_products.ycp 2011-08-03 10:40:10.000000000 +0200
+++ new/yast2-wagon-2.22.0/src/clients/wagon_migration_products.ycp 2011-11-16 11:39:43.000000000 +0100
@@ -106,7 +106,7 @@
if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") {
y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade);
Report::Error (sformat (_("Cannot upgrade product %1 (%2).
-Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined")));
+Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("undefined")));
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.21.6/src/clients/wagon_registration_check.ycp new/yast2-wagon-2.22.0/src/clients/wagon_registration_check.ycp
--- old/yast2-wagon-2.21.6/src/clients/wagon_registration_check.ycp 2011-08-01 14:04:03.000000000 +0200
+++ new/yast2-wagon-2.22.0/src/clients/wagon_registration_check.ycp 2011-11-16 11:39:43.000000000 +0100
@@ -81,7 +81,7 @@
if (!status["registered_system"]:false)
{
- msg = msg + "<p>" + _("The system is not registered") + "</p>";
+ msg = msg + "<p>" + _("The system is not registered.") + "</p>";
}
else
{
@@ -89,14 +89,14 @@
foreach(string prod, (list<string>)status["registered"]:[],
{
- msg = msg + "<li>" + sformat(_("Product <b>%1</b> has a valid registration"),
+ msg = msg + "<li>" + sformat(_("Product <b>%1</b> has a valid registration."),
InstalledProduct(prod)["display_name"]:prod) + "</li>";
}
);
foreach(string prod, (list<string>)status["no_subscription"]:[],
{
- msg = msg + "<li>" + sformat(_("Product <b>%1</b> does not need a subscription"),
+ msg = msg + "<li>" + sformat(_("Product <b>%1</b> does not need a subscription."),
InstalledProduct(prod)["display_name"]:prod) + "</li>";
}
);
@@ -104,7 +104,7 @@
foreach(map
participants (1)
-
root@hilbert.suse.de