Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at 2013-08-27 21:19:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes
2013-08-12 11:04:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes
2013-08-27 21:56:07.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 22 08:20:25 CEST 2013 - jsuch...@suse.cz
+
+- use OSRelease instead of obsolete SuSERelease (bnc#833955)
+- 3.0.2
+
+-------------------------------------------------------------------
Old:
----
yast2-update-3.0.1.tar.bz2
New:
----
yast2-update-3.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.WT3wI3/_old 2013-08-27 21:56:08.000000000 +0200
+++ /var/tmp/diff_new_pack.WT3wI3/_new 2013-08-27 21:56:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-update
-Version: 3.0.1
+Version: 3.0.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,9 +30,8 @@
# Stroage::ChangeDmNamesFromCrypttab
BuildRequires: yast2-storage >= 2.22.9
# Packages::GetBaseSourceID
+BuildRequires: yast2 >= 3.0.4
BuildRequires: yast2-packager >= 2.17.19
-# Wizard::OpenOKDialog
-BuildRequires: yast2 >= 2.16.49
# package not really needed to be installed but this breaks the building cycle
# xmllint
@@ -43,8 +42,8 @@
# Stroage::ChangeDmNamesFromCrypttab
Requires: yast2-storage >= 2.22.9
-# PackagesUI::RunPackageSelector
-Requires: yast2 >= 2.17.40
+# OSRelease
+Requires: yast2 >= 3.0.4
Requires: yast2-installation
# Function SelectKernelPackages has been moved to Packages module (bnc
#326269).
Requires: yast2-packager >= 2.17.27
@@ -53,10 +52,6 @@
# to remove dependency on yast2-storage
Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp
-# Required only in inst-sys
-# Requires: yast2-storage
-# Requires: yast2-country
-
# Pkg::PkgUpdateAll (map conf)
Conflicts: yast2-pkg-bindings < 2.15.11
# Storage::DeviceMatchFstab (#244117)
++++++ yast2-update-3.0.1.tar.bz2 -> yast2-update-3.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/Makefile.am.common
new/yast2-update-3.0.2/Makefile.am.common
--- old/yast2-update-3.0.1/Makefile.am.common 2013-08-07 17:29:24.000000000
+0200
+++ new/yast2-update-3.0.2/Makefile.am.common 2013-08-22 08:46:57.000000000
+0200
@@ -15,6 +15,7 @@
CLEANFILES = ${ybcfiles}
DISTCLEANFILES = .dep
+if HAS_YCP_MODULES
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
@@ -26,6 +27,8 @@
${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
cat ${NEWDEP} > .dep
rm ${NEWDEP}
+-include .dep
+endif
dist-hook: check-syntax
@@ -58,4 +61,3 @@
fi; \
fi
--include .dep
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/VERSION
new/yast2-update-3.0.2/VERSION
--- old/yast2-update-3.0.1/VERSION 2013-08-05 21:11:57.000000000 +0200
+++ new/yast2-update-3.0.2/VERSION 2013-08-22 08:46:50.000000000 +0200
@@ -1 +1 @@
-3.0.1
+3.0.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/autodocs-ycp.ami
new/yast2-update-3.0.2/autodocs-ycp.ami
--- old/yast2-update-3.0.1/autodocs-ycp.ami 2013-08-07 17:29:24.000000000
+0200
+++ new/yast2-update-3.0.2/autodocs-ycp.ami 2013-08-22 08:46:57.000000000
+0200
@@ -17,8 +17,11 @@
htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/configure
new/yast2-update-3.0.2/configure
--- old/yast2-update-3.0.1/configure 2013-08-07 17:29:28.000000000 +0200
+++ new/yast2-update-3.0.2/configure 2013-08-22 08:47:00.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-update 3.0.1.
+# Generated by GNU Autoconf 2.69 for yast2-update 3.0.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='3.0.1'
-PACKAGE_STRING='yast2-update 3.0.1'
+PACKAGE_VERSION='3.0.2'
+PACKAGE_STRING='yast2-update 3.0.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -588,6 +588,8 @@
ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS
LIBOBJS
+HAS_YCP_MODULES_FALSE
+HAS_YCP_MODULES_TRUE
YCPC
YCPMAKEDEP
YCPDOC
@@ -1247,7 +1249,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-update 3.0.1 to adapt to many kinds of systems.
+\`configure' configures yast2-update 3.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1320,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 3.0.1:";;
+ short | recursive ) echo "Configuration of yast2-update 3.0.2:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1400,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 3.0.1
+yast2-update configure 3.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1417,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-update $as_me 3.0.1, which was
+It was created by yast2-update $as_me 3.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2356,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='3.0.1'
+ VERSION='3.0.2'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2479,7 @@
-VERSION="3.0.1"
+VERSION="3.0.2"
RPMNAME="yast2-update"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
@@ -2841,6 +2843,29 @@
fi
+# handle .dep files in Makefile.am.common if any YCP module is present
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5
+$as_echo_n "checking for YCP modules... " >&6; }
+
+# YCP module file name starts with an upper case letter
+find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1
+ if test -n "$has_ycp_modules"; then
+ HAS_YCP_MODULES_TRUE=
+ HAS_YCP_MODULES_FALSE='#'
+else
+ HAS_YCP_MODULES_TRUE='#'
+ HAS_YCP_MODULES_FALSE=
+fi
+
+
+if test -n "$has_ycp_modules"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
( cd src/config; ln -sf update.xml update.glade )
@@ -3008,6 +3033,10 @@
as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}";
then
+ as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -3405,7 +3434,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-update $as_me 3.0.1, which was
+This file was extended by yast2-update $as_me 3.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3458,7 +3487,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-update config.status 3.0.1
+yast2-update config.status 3.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/configure.ac
new/yast2-update-3.0.2/configure.ac
--- old/yast2-update-3.0.1/configure.ac 2013-08-07 17:29:24.000000000 +0200
+++ new/yast2-update-3.0.2/configure.ac 2013-08-22 08:46:57.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-update, 3.0.1, http://bugs.opensuse.org/, yast2-update)
+AC_INIT(yast2-update, 3.0.2, http://bugs.opensuse.org/, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="3.0.1"
+VERSION="3.0.2"
RPMNAME="yast2-update"
MAINTAINER="Jiří Suchomel <jsuch...@suse.cz>"
@@ -149,6 +149,19 @@
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_RESULT([not found])
+fi
+
( cd src/config; ln -sf update.xml update.glade )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/doc/autodocs/Makefile.in
new/yast2-update-3.0.2/doc/autodocs/Makefile.in
--- old/yast2-update-3.0.1/doc/autodocs/Makefile.in 2013-08-07
17:29:29.000000000 +0200
+++ new/yast2-update-3.0.2/doc/autodocs/Makefile.in 2013-08-22
08:47:01.000000000 +0200
@@ -237,8 +237,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
+# find all files in Yast/ subdirectory if it exists
+YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f)
+
# use nobase_ prefix to keep the directory structure
-nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*)
+nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
$(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES)
CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/src/Makefile.in
new/yast2-update-3.0.2/src/Makefile.in
--- old/yast2-update-3.0.1/src/Makefile.in 2013-08-07 17:29:29.000000000
+0200
+++ new/yast2-update-3.0.2/src/Makefile.in 2013-08-22 08:47:01.000000000
+0200
@@ -265,7 +265,7 @@
# Needs to be outside "." because of cases
# where ycpchook contains a symlink to "."
# Otherwise "." keeps being newer than .dep and we loop.
-NEWDEP = ${top_builddir}/.dep.new
+@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new
CHECK_SYNTAX = true
all: all-am
@@ -618,10 +618,11 @@
# generate dependencies
# two steps not to lose the file if the command fails
# hook: create the links before we look for files
-.dep: $(wildcard *.ycp) ${ycpchook}
- ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
- cat ${NEWDEP} > .dep
- rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@.dep: $(wildcard *.ycp) ${ycpchook}
+@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} >
${NEWDEP}
+@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep
+@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP}
+@HAS_YCP_MODULES_TRUE@-include .dep
dist-hook: check-syntax
check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA)
$(ycpchook) $(ybcfiles)
@@ -652,8 +653,6 @@
fi; \
fi
--include .dep
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/src/modules/RootPart.rb
new/yast2-update-3.0.2/src/modules/RootPart.rb
--- old/yast2-update-3.0.1/src/modules/RootPart.rb 2013-07-30
13:10:07.000000000 +0200
+++ new/yast2-update-3.0.2/src/modules/RootPart.rb 2013-08-22
08:46:50.000000000 +0200
@@ -44,7 +44,7 @@
Yast.import "ModuleLoading"
Yast.import "FileSystems"
Yast.import "Update"
- Yast.import "SuSERelease"
+ Yast.import "OSRelease"
Yast.import "FileUtils"
Yast.import "Arch"
Yast.import "String"
@@ -1960,7 +1960,7 @@
end
# Get installed release name
- release = SuSERelease.ReleaseInformation(Installation.destdir)
+ release = OSRelease.ReleaseInformation(Installation.destdir)
Builtins.y2debug("release: %1", release)
if release == "?"
# label for an unknown installed system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-3.0.1/src/modules/Update.rb
new/yast2-update-3.0.2/src/modules/Update.rb
--- old/yast2-update-3.0.1/src/modules/Update.rb 2013-07-30
13:10:07.000000000 +0200
+++ new/yast2-update-3.0.2/src/modules/Update.rb 2013-08-22
08:46:50.000000000 +0200
@@ -42,7 +42,7 @@
Yast.import "ProductFeatures"
Yast.import "ProductControl"
Yast.import "Stage"
- Yast.import "SuSERelease"
+ Yast.import "OSRelease"
Yast.import "Mode"
# number of packages to install
@@ -137,45 +137,6 @@
ret
end
- # Returns whether old packages should be removed (defined in control file).
- # True means - delete old RPMs when updating. (Functionality for FATE
#301844).
- # // not supported by libzypp anymore
- #
- # global boolean DeleteOldPackages () {
- # // changes deleteOldPackages variable
- # any default_dop_a = ProductFeatures::GetFeature ("software",
"delete_old_packages");
- #
- # boolean default_dop = nil;
- # if (default_dop_a == nil || default_dop_a == "") {
- # y2error ("software/delete_old_packages not defined");
- # return false;
- # }
- # if (is (default_dop_a, boolean)) default_dop = (boolean) default_dop_a;
- #
- # string installed_system = SuSERelease::ReleaseInformation
(Installation::destdir);
- # y2milestone ("Processing '%1' from '%2'", installed_system,
Installation::destdir);
- #
- # if (installed_system == nil || installed_system == "") {
- # y2error ("Cannot find out installed system name");
- # return default_dop;
- # }
- #
- # any reverse_dop_a = ProductFeatures::GetFeature ("software",
"delete_old_packages_reverse_list");
- # // No reverse rules defined
- # if (reverse_dop_a == "") {
- # return default_dop;
- # }
- # // not a list or empty list
- # list <string> reverse_dop = (list <string>) reverse_dop_a;
- # if (reverse_dop == nil || reverse_dop == []) return default_dop;
- #
- # if (ListOfRegexpsMatchesProduct (reverse_dop, installed_system)) {
- # return (! default_dop);
- # }
- #
- # return default_dop;
- # }
-
# Returns whether upgrade process should only update installed packages or
# also install new packages. True means - do not upgrade, only update
packages.
# (Functionality for FATE #301844).
@@ -195,7 +156,7 @@
default_ous = Convert.to_boolean(default_ous_a)
end
- installed_system = SuSERelease.ReleaseInformation(Installation.destdir)
+ installed_system = OSRelease.ReleaseInformation(Installation.destdir)
Builtins.y2milestone(
"Processing '%1' from '%2'",
installed_system,
@@ -247,7 +208,7 @@
default_sdp = Convert.to_boolean(default_sdp_a)
end
- installed_system = SuSERelease.ReleaseInformation(Installation.destdir)
+ installed_system = OSRelease.ReleaseInformation(Installation.destdir)
Builtins.y2milestone(
"Processing '%1' from '%2'",
installed_system,
@@ -283,7 +244,7 @@
# Returns whether the installed product is supported for upgrade.
# (Functionality for FATE #301844).
def IsProductSupportedForUpgrade
- installed_system = SuSERelease.ReleaseInformation(Installation.destdir)
+ installed_system = OSRelease.ReleaseInformation(Installation.destdir)
Builtins.y2milestone(
"Processing '%1' from '%2'",
installed_system,
@@ -520,8 +481,8 @@
# cannot use product information from package manager
# for pre-zypp products
# #153576
- old_name = SuSERelease.ReleaseInformation(Installation.destdir)
- Builtins.y2milestone("SuSERelease::ReleaseInformation: %1", old_name)
+ old_name = OSRelease.ReleaseInformation(Installation.destdir)
+ Builtins.y2milestone("OSRelease::ReleaseInformation: %1", old_name)
# Remove 'Beta...' from product release
if Builtins.regexpmatch(old_name, "Beta")
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
