From 70d77572ef845390d1f5411855a545035446df6fdced4a6f58fab7e45faeab3d Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:09 +0000 Subject: [PATCH 01/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=136 --- YaST2-Firstboot.service | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/YaST2-Firstboot.service b/YaST2-Firstboot.service index 8cdb491..61b2194 100644 --- a/YaST2-Firstboot.service +++ b/YaST2-Firstboot.service @@ -2,15 +2,12 @@ Description=YaST2 Firstboot After=apparmor.service local-fs.target YaST2-Second-Stage.service Before=getty@tty1.service 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 From 72a2bbc81221bc0e6d23f7f7056d0b5362ca6cee1de38fbd990cf05bbb32ab25 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:22 +0000 Subject: [PATCH 02/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=137 --- yast2-installation-2.21.22.tar.bz2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 yast2-installation-2.21.22.tar.bz2 diff --git a/yast2-installation-2.21.22.tar.bz2 b/yast2-installation-2.21.22.tar.bz2 new file mode 100644 index 0000000..6055045 --- /dev/null +++ b/yast2-installation-2.21.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2aeae1dd28c1e52ad1fea57f89b80edc2eeaef7d9d194c4904e55532b3c6c1 +size 282103 From ec10af146a61ee27d4516b4c6158aa82f8dfa9321dd9c7c22e0abf87379bb521 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:33 +0000 Subject: [PATCH 03/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=138 --- yast2-installation.changes | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/yast2-installation.changes b/yast2-installation.changes index f36fa98..5b7d671 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 7 11:38:39 UTC 2011 - fcrozat@suse.com + +- 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 - jsrain@suse.cz + +- change the URL for congratulation dialog (bnc#720481) + ------------------------------------------------------------------- Mon Sep 26 10:41:38 CEST 2011 - jsuchome@suse.cz From daf17be4ac876eab56ab2bfccdf9cba34842f38103bfae6a45822f998b9bf4e4 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:40 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=139 --- yast2-installation.spec | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index c76714b..90d8148 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,34 +1,20 @@ # -# spec file for package yast2-installation +# spec file for package yast2-installation (Version 2.21.22) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - # norootforbuild +Name: yast2-installation +Version: 2.21.22 +Release: 0 -Name: yast2-installation -Version: 2.21.21 -Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.21.22.tar.bz2 -Prefix: /usr +prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPL-2.0+ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service @@ -147,7 +133,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-%{version} +%setup -n yast2-installation-2.21.22 %build %{prefix}/bin/y2tool y2autoconf @@ -187,15 +173,12 @@ rm -rf "$RPM_BUILD_ROOT" %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 From f625ad300d1bfe4b6a96864c57b827de6a429937eb523d108719022bbf2bdeed Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:47 +0000 Subject: [PATCH 05/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=140 --- YaST2-Second-Stage.service | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service index c06b34c..78f5eb2 100644 --- a/YaST2-Second-Stage.service +++ b/YaST2-Second-Stage.service @@ -2,17 +2,14 @@ Description=YaST2 Second Stage After=apparmor.service local-fs.target Before=getty@tty1.service 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 From 44631c77ddae46618863d7080a28e53ebf638a162ead0c3f19b9235b037ea7c5 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Fri, 7 Oct 2011 12:46:58 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=141 --- yast2-installation-2.21.21.tar.bz2 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 yast2-installation-2.21.21.tar.bz2 diff --git a/yast2-installation-2.21.21.tar.bz2 b/yast2-installation-2.21.21.tar.bz2 deleted file mode 100644 index 24d5fb0..0000000 --- a/yast2-installation-2.21.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94f7ab24b9b8eb198af2375b2f5c0aa427f12762c9c715befe96ea40004a6337 -size 301490 From 932c7fa58801ff8cfa8cd993bd3c0998230559029ecc1e5db50cf1d615560af5 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Mon, 10 Oct 2011 08:21:53 +0000 Subject: [PATCH 07/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=142 --- yast2-installation.spec | 55 +++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index 90d8148..0760f58 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,17 +1,30 @@ # -# spec file for package yast2-installation (Version 2.21.22) +# spec file for package yast2-installation # +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + # norootforbuild -Name: yast2-installation -Version: 2.21.22 -Release: 0 +Name: yast2-installation +Version: 2.21.22 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.22.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-%{version}.tar.bz2 -prefix: /usr Group: System/YaST License: GPL-2.0+ @@ -133,26 +146,26 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.22 +%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 @@ -201,7 +214,7 @@ rm -rf "$RPM_BUILD_ROOT" /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 @@ -223,17 +236,17 @@ rm -rf "$RPM_BUILD_ROOT" /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 +%doc %{_prefix}/share/doc/packages/yast2-installation +%exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING +%exclude %{_prefix}/share/doc/packages/yast2-installation/README From b9693ff6f275cc6f2667e38ce716d468c529a61954efe5476fb31c2fcdf0592d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 11 Oct 2011 07:09:33 +0000 Subject: [PATCH 08/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=143 --- yast2-installation-2.21.23.tar.bz2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 yast2-installation-2.21.23.tar.bz2 diff --git a/yast2-installation-2.21.23.tar.bz2 b/yast2-installation-2.21.23.tar.bz2 new file mode 100644 index 0000000..d72f3e4 --- /dev/null +++ b/yast2-installation-2.21.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b88bc90944d75eb3b9af5f07c0a28f98f8055e08714eada7edc316acf7c72b +size 284390 From c0c9ac50cf1bc23c0d8cb06a7a66cfe69f060b394df41fc284e749a62c63107e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 11 Oct 2011 07:10:12 +0000 Subject: [PATCH 09/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=144 --- yast2-installation.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/yast2-installation.changes b/yast2-installation.changes index 5b7d671..0e9cf18 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 08:52:43 CEST 2011 - jsuchome@suse.cz + +- compress the log file from 1st stage of installation (bnc#716938) +- 2.21.23 + ------------------------------------------------------------------- Fri Oct 7 11:38:39 UTC 2011 - fcrozat@suse.com From 46a3de490fe4374903680dde772991b6e60c7591751b30144b4b482370a63735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 11 Oct 2011 07:10:41 +0000 Subject: [PATCH 10/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=145 --- yast2-installation.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index 0760f58..9e09d4a 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -19,7 +19,7 @@ Name: yast2-installation -Version: 2.21.22 +Version: 2.21.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From 965c83c40d07be3f3db997dae956c1a28932dccc3de97a36db06819b33b1ec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Tue, 11 Oct 2011 07:10:50 +0000 Subject: [PATCH 11/11] OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=146 --- yast2-installation-2.21.22.tar.bz2 | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 yast2-installation-2.21.22.tar.bz2 diff --git a/yast2-installation-2.21.22.tar.bz2 b/yast2-installation-2.21.22.tar.bz2 deleted file mode 100644 index 6055045..0000000 --- a/yast2-installation-2.21.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b2aeae1dd28c1e52ad1fea57f89b80edc2eeaef7d9d194c4904e55532b3c6c1 -size 282103