Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Tue Oct 11 17:08:12 CEST 2011.
-------- --- openSUSE:Factory/yast2-installation/yast2-installation.changes 2011-09-26 17:08:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-10-11 09:10:12.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Oct 11 08:52:43 CEST 2011 - [email protected] + +- compress the log file from 1st stage of installation (bnc#716938) +- 2.21.23 + +------------------------------------------------------------------- +Fri Oct 7 11:38:39 UTC 2011 - [email protected] + +- Use latest macros for systemd +- Drop workaround for bnc#719221, systemd is fixed now. +- 2.21.22 + +------------------------------------------------------------------- +Fri Oct 7 11:30:21 UTC 2011 - [email protected] + +- change the URL for congratulation dialog (bnc#720481) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.21.21.tar.bz2 New: ---- yast2-installation-2.21.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.1c4XTt/_old 2011-10-11 17:08:04.000000000 +0200 +++ /var/tmp/diff_new_pack.1c4XTt/_new 2011-10-11 17:08:04.000000000 +0200 @@ -19,16 +19,15 @@ Name: yast2-installation -Version: 2.21.21 -Release: 1 +Version: 2.21.23 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 -Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service @@ -128,12 +127,11 @@ PreReq: %fillup_prereq -BuildArch: noarch +BuildArchitectures: noarch Summary: YaST2 - Installation Parts %package devel-doc - Group: Documentation/HTML Requires: yast2-installation >= 2.15.34 @@ -151,23 +149,23 @@ %setup -n yast2-installation-%{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 @@ -188,15 +186,12 @@ %if 0%{suse_version} > 1140 -%service_add YaST2-Second-Stage.service YaST2-Firstboot.service +%service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service -/bin/systemctl enable YaST2-Second-Stage.service > /dev/null 2>&1 || : -/bin/systemctl enable YaST2-Firstboot.service > /dev/null 2>&1 || : +%pre +%service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service %preun -if [ $1 -eq 0 ]; then - /bin/systemctl disable YaST2-Second-Stage.service YaST2-Firstboot.service > /dev/null 2>&1 || : -fi %service_del_preun YaST2-Second-Stage.service YaST2-Firstboot.service %postun @@ -219,7 +214,7 @@ /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc -%{prefix}/share/applications/YaST2/*.desktop +%{_prefix}/share/applications/YaST2/*.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc %dir /usr/share/autoinstall @@ -241,18 +236,17 @@ /var/adm/fillup-templates/sysconfig.security-checksig # programs and scripts -%{prefix}/lib/YaST2/startup +%{_prefix}/lib/YaST2/startup # icewm /etc/icewm -%dir %{prefix}/share/doc/packages/yast2-installation -%{prefix}/share/doc/packages/yast2-installation/COPYING -%readme %{prefix}/share/doc/packages/yast2-installation/README +%dir %{_prefix}/share/doc/packages/yast2-installation +%{_prefix}/share/doc/packages/yast2-installation/COPYING +%readme %{_prefix}/share/doc/packages/yast2-installation/README %files devel-doc %defattr(-,root,root) -%doc %{prefix}/share/doc/packages/yast2-installation -%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING -%exclude %{prefix}/share/doc/packages/yast2-installation/README -%changelog +%doc %{_prefix}/share/doc/packages/yast2-installation +%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING +%exclude %{_prefix}/share/doc/packages/yast2-installation/README ++++++ YaST2-Firstboot.service ++++++ --- /var/tmp/diff_new_pack.1c4XTt/_old 2011-10-11 17:08:04.000000000 +0200 +++ /var/tmp/diff_new_pack.1c4XTt/_new 2011-10-11 17:08:04.000000000 +0200 @@ -2,15 +2,12 @@ Description=YaST2 Firstboot After=apparmor.service local-fs.target YaST2-Second-Stage.service [email protected] xdm.service -ConditionPathExists=|/var/lib/YaST2/reconfig_system -ConditionPathExists=|/run/systemd/keep_running +ConditionPathExists=/var/lib/YaST2/reconfig_system [Service] Type=oneshot -ExecStartPre=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot ExecStartPost=/bin/rm -f /var/lib/YaST2/reconfig_system -ExecStartPost=/bin/rm -f /run/systemd/keep_running TimeoutSec=0 RemainAfterExit=true ++++++ YaST2-Second-Stage.service ++++++ --- /var/tmp/diff_new_pack.1c4XTt/_old 2011-10-11 17:08:04.000000000 +0200 +++ /var/tmp/diff_new_pack.1c4XTt/_new 2011-10-11 17:08:04.000000000 +0200 @@ -2,17 +2,14 @@ Description=YaST2 Second Stage After=apparmor.service local-fs.target [email protected] xdm.service -ConditionPathExists=|/var/lib/YaST2/runme_at_boot -ConditionPathExists=|/run/systemd/keep_running +ConditionPathExists=/var/lib/YaST2/runme_at_boot [Service] Type=oneshot -ExecStart=/bin/touch /run/systemd/keep_running ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage RemainAfterExit=yes TimeoutSec=0 ExecStartPost=/bin/rm -f /var/lib/YaST2/runme_at_boot -ExecStartPost=/bin/rm -f /run/systemd/keep_running [Install] WantedBy=default.target ++++++ yast2-installation-2.21.21.tar.bz2 -> yast2-installation-2.21.23.tar.bz2 ++++++ ++++ 3326 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-installation-2.21.21/Makefile.am new/yast2-installation-2.21.23/Makefile.am --- old/yast2-installation-2.21.21/Makefile.am 2011-09-26 11:03:29.000000000 +0200 +++ new/yast2-installation-2.21.23/Makefile.am 2011-10-11 09:07:05.000000000 +0200 @@ -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-installation-2.21.21/VERSION new/yast2-installation-2.21.23/VERSION --- old/yast2-installation-2.21.21/VERSION 2011-09-26 10:42:12.000000000 +0200 +++ new/yast2-installation-2.21.23/VERSION 2011-10-11 09:06:21.000000000 +0200 @@ -1 +1 @@ -2.21.21 +2.21.23 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-installation-2.21.21/configure.in new/yast2-installation-2.21.23/configure.in --- old/yast2-installation-2.21.21/configure.in 2011-09-26 11:03:29.000000000 +0200 +++ new/yast2-installation-2.21.23/configure.in 2011-10-11 09:07:05.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.21.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.21.21, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.21.23, http://bugs.opensuse.org/, yast2-installation) 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="2.21.21" +VERSION="2.21.23" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" 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-installation-2.21.21/control/control.SLED.xml new/yast2-installation-2.21.23/control/control.SLED.xml --- old/yast2-installation-2.21.21/control/control.SLED.xml 2011-06-03 14:49:18.000000000 +0200 +++ new/yast2-installation-2.21.23/control/control.SLED.xml 2011-10-11 09:06:01.000000000 +0200 @@ -353,7 +353,7 @@ Click <b>Finish</b> to log in to the system. </p> <p> -Please visit us at http://www.novell.com/linux/. +Please visit us at http://www.suse.com/. </p> </label> </congratulate> 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-installation-2.21.21/control/control.SLES.xml new/yast2-installation-2.21.23/control/control.SLES.xml --- old/yast2-installation-2.21.21/control/control.SLES.xml 2011-06-03 14:49:18.000000000 +0200 +++ new/yast2-installation-2.21.23/control/control.SLES.xml 2011-10-11 09:06:01.000000000 +0200 @@ -307,7 +307,7 @@ Click Finish to log in to the system. </p> <p> -Please visit us at http://www.novell.com/linux/. +Please visit us at http://www.suse.com/. </p> </label> </congratulate> 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-installation-2.21.21/src/clients/inst_congratulate.ycp new/yast2-installation-2.21.23/src/clients/inst_congratulate.ycp --- old/yast2-installation-2.21.21/src/clients/inst_congratulate.ycp 2011-09-06 10:39:39.000000000 +0200 +++ new/yast2-installation-2.21.23/src/clients/inst_congratulate.ycp 2011-10-11 09:06:08.000000000 +0200 @@ -6,7 +6,7 @@ * * Display a congratulation message for the user. * - * $Id: inst_congratulate.ycp 65570 2011-09-06 08:39:37Z jsuchome $ + * $Id: inst_congratulate.ycp 66319 2011-10-07 11:25:53Z jsrain $ */ { @@ -95,7 +95,7 @@ string vendor_url_tmp = ProductFeatures::GetStringFeature("globals", "vendor_url"); // fallback - string vendor_url = "http://www.novell.com/linux/";; + string vendor_url = "http://www.suse.com/";; if (ProductFeatures::GetStringFeature("globals", "ui_mode") == "simple") { vendor_url = "http://www.openSUSE.org";; } 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-installation-2.21.21/src/inst_finish/copy_logs_finish.ycp new/yast2-installation-2.21.23/src/inst_finish/copy_logs_finish.ycp --- old/yast2-installation-2.21.21/src/inst_finish/copy_logs_finish.ycp 2009-12-18 14:52:10.000000000 +0100 +++ new/yast2-installation-2.21.23/src/inst_finish/copy_logs_finish.ycp 2011-10-11 09:06:16.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: copy_logs_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * $Id: copy_logs_finish.ycp 66372 2011-10-11 07:04:05Z jsuchome $ * */ @@ -58,7 +58,11 @@ if ( size( file ) > size( "y2log-" ) ) target_no = 1 + tointeger( substring( file, size( "y2log-" ), 5 ) ); - InjectRenamedFile( Directory::logdir, file, sformat( "y2log-%1", target_no ) ); + string target_basename = sformat( "y2log-%1", target_no ); + InjectRenamedFile( Directory::logdir, file, target_basename ); + + string compress_cmd = sformat("gzip %1/%2/%3", Installation::destdir, Directory::logdir, target_basename); + WFM::Execute (.local.bash, compress_cmd); } else if ( regexpmatch (file, "^y2log-[0-9]+\\.gz$")) { continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
