From d388a346abbfafa6da0daffc03374d1fe29928f131a3041114fc28db587434fe Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 1 Sep 2011 13:10:10 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/autoyast2 revision 99.0 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=81eaaf9866736d0b3c0c0d0bb287cf3a --- autoyast2.spec | 97 +++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/autoyast2.spec b/autoyast2.spec index b672665..1e00dce 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,44 +1,58 @@ # -# spec file for package autoyast2 (Version 2.21.0) +# spec file for package autoyast2 # +# 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: autoyast2 -Version: 2.21.0 -Release: 0 +Name: autoyast2 +Version: 2.21.0 +Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.21.0.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.21.0.tar.bz2 -prefix: /usr +Prefix: /usr -Group: System/YaST -License: GPL v2 or later -BuildRequires: java2-devel-packages yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +Group: System/YaST +License: GPL v2 or later +BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer # API for Disabled Modules (ProductControl) -BuildRequires: yast2 >= 2.16.36 +BuildRequires: yast2 >= 2.16.36 # After API cleanup -BuildRequires: yast2-update >= 2.18.3 -BuildRequires: yast2-storage >= 2.19.8 +BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.8 -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country yast2-storage -Requires: yast2-storage >= 2.19.13 -Requires: yast2-transfer >= 2.21.0 +Requires: yast2 >= 2.16.36 +Requires: yast2-core yast2-xml libxslt +Requires: autoyast2-installation = %{version} +Requires: yast2-schema yast2 yast2-country yast2-storage +Requires: yast2-storage >= 2.19.13 +Requires: yast2-transfer >= 2.21.0 -Provides: yast2-module-autoinst yast2-config-autoinst -Obsoletes: yast2-module-autoinst yast2-config-autoinst -Provides: yast2-lib-autoinst -Obsoletes: yast2-lib-autoinst +Provides: yast2-module-autoinst yast2-config-autoinst +Obsoletes: yast2-module-autoinst yast2-config-autoinst +Provides: yast2-lib-autoinst +Obsoletes: yast2-lib-autoinst -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - Automated Installation +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -51,17 +65,20 @@ This file contains YaST2-independent files needed to create installation sources. %package installation -Version: 2.21.0 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST + +Version: 2.21.0 +Release: 1 +Summary: YaST2 - Auto Installation Modules +Group: System/YaST # API for Disabled Modules (ProductControl) -Requires: yast2 >= 2.16.36 +Requires: yast2 >= 2.16.36 # After API cleanup -Requires: yast2-update >= 2.18.3 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp -Requires: yast2-transfer >= 2.21.0 -Provides: yast2-trans-autoinst -Obsoletes: yast2-trans-autoinst +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp +Requires: yast2-transfer >= 2.21.0 +Provides: yast2-trans-autoinst +Obsoletes: yast2-trans-autoinst + %description installation This package performs auto-installation relying on a control file generated with the autoyast2 package. @@ -121,7 +138,6 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} - %files %defattr(-,root,root) %dir /etc/autoinstall @@ -133,7 +149,6 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/tmp %doc %{prefix}/share/doc/packages/autoyast2 - %{prefix}/share/applications/YaST2/autoyast.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/include/autoinstall/classes.ycp @@ -158,18 +173,14 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/ksimport.scr - /usr/share/YaST2/modules/AutoinstClass.y* /usr/share/YaST2/modules/Kickstart.y* /usr/lib/YaST2/servers_non_y2/ag_ksimport - - # additional files /var/adm/fillup-templates/sysconfig.autoinstall - %files installation %defattr(-,root,root) /usr/share/YaST2/scrconf/autoinstall.scr @@ -241,7 +252,6 @@ rm -rf "$RPM_BUILD_ROOT" # scripts %{prefix}/lib/YaST2/bin/fetch_image.sh - %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -250,5 +260,4 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf - - +%changelog From cbeb35dd9f2e62e794bb8dd890c972e8fa4ad97252c854cf52e6d0fc69f6773f Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Sat, 3 Sep 2011 12:42:55 +0000 Subject: [PATCH 2/3] Accepting request 80683 from home:msmeissn:branches:YaST:Head remove java dependency OBS-URL: https://build.opensuse.org/request/show/80683 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=58 --- autoyast2.changes | 5 +++++ autoyast2.spec | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/autoyast2.changes b/autoyast2.changes index deeb564..d3601a6 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 2 15:25:58 CEST 2011 - meissner@suse.de + +- remove java-devel-packages from BuildRequires, they are unused. + ------------------------------------------------------------------- Fri Jul 29 15:56:00 CEST 2011 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index 1e00dce..e21c15c 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -29,7 +29,7 @@ Prefix: /usr Group: System/YaST License: GPL v2 or later -BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer +BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer # API for Disabled Modules (ProductControl) BuildRequires: yast2 >= 2.16.36 # After API cleanup @@ -99,9 +99,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" # 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 -[ -n "$JAVA_HOME" ] && unset JAVA_HOME -. /usr/share/java-utils/java-functions -export JAVA_HOME %install make install DESTDIR="$RPM_BUILD_ROOT" From 1cb6bdbcd58c33aa9dcd2d8fa1081320f3d67d3ed193ddf2bf16b898ba199c9d Mon Sep 17 00:00:00 2001 From: Uwe Gansert Date: Mon, 5 Sep 2011 14:34:50 +0000 Subject: [PATCH 3/3] 2.21.1 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/autoyast2?expand=0&rev=59 --- autoyast2-2.21.0.tar.bz2 | 3 -- autoyast2-2.21.1.tar.bz2 | 3 ++ autoyast2.changes | 33 +++++++++++++- autoyast2.spec | 99 ++++++++++++++++++---------------------- 4 files changed, 79 insertions(+), 59 deletions(-) delete mode 100644 autoyast2-2.21.0.tar.bz2 create mode 100644 autoyast2-2.21.1.tar.bz2 diff --git a/autoyast2-2.21.0.tar.bz2 b/autoyast2-2.21.0.tar.bz2 deleted file mode 100644 index 4ea50b8..0000000 --- a/autoyast2-2.21.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5555ac96140f22080fe747aa7d2d00f39620052880bd1d1dc09e24ace0dcfc2 -size 1237510 diff --git a/autoyast2-2.21.1.tar.bz2 b/autoyast2-2.21.1.tar.bz2 new file mode 100644 index 0000000..b01e9fd --- /dev/null +++ b/autoyast2-2.21.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e75471c7a06927ec4483adc72248e8fb1a6c98fd1254748f620380ab32e63d1 +size 1236318 diff --git a/autoyast2.changes b/autoyast2.changes index d3601a6..5c80b90 100644 --- a/autoyast2.changes +++ b/autoyast2.changes @@ -1,7 +1,36 @@ ------------------------------------------------------------------- -Fri Sep 2 15:25:58 CEST 2011 - meissner@suse.de +Mon Sep 5 13:09:11 CEST 2011 - ug@suse.de -- remove java-devel-packages from BuildRequires, they are unused. +- removed java from BuildRequires +- 2.21.1 + +------------------------------------------------------------------- +Thu Sep 1 17:16:14 CEST 2011 - ug@suse.de + +- fixed scripts execution during auto-upgrade + (bnc#715468) + +------------------------------------------------------------------- +Thu Sep 1 14:46:18 CEST 2011 - ug@suse.de + +- reuse partition with mountby=uuid fixed + (bnc#715435) + +------------------------------------------------------------------- +Wed Aug 31 13:29:18 CEST 2011 - ug@suse.de + +- relurl did not work in 2nd stage, like for post + and init-scripts (bnc#666189) + +------------------------------------------------------------------- +Tue Aug 30 15:43:07 CEST 2011 - ug@suse.de + +- typos fixed (bnc#702657) + +------------------------------------------------------------------- +Fri Aug 5 12:30:46 CEST 2011 - tgoettlicher@suse.de + +- fixed .desktop file (bnc #681249) ------------------------------------------------------------------- Fri Jul 29 15:56:00 CEST 2011 - ug@suse.de diff --git a/autoyast2.spec b/autoyast2.spec index e21c15c..9f7c66a 100644 --- a/autoyast2.spec +++ b/autoyast2.spec @@ -1,58 +1,44 @@ # -# spec file for package autoyast2 +# spec file for package autoyast2 (Version 2.21.1) # -# 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: autoyast2 +Version: 2.21.1 +Release: 0 -Name: autoyast2 -Version: 2.21.0 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.21.0.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: autoyast2-2.21.1.tar.bz2 -Prefix: /usr +prefix: /usr -Group: System/YaST -License: GPL v2 or later -BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-slp yast2-testsuite yast2-transfer +Group: System/YaST +License: GPL v2 or later +BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp # API for Disabled Modules (ProductControl) -BuildRequires: yast2 >= 2.16.36 +BuildRequires: yast2 >= 2.16.36 # After API cleanup -BuildRequires: yast2-update >= 2.18.3 -BuildRequires: yast2-storage >= 2.19.8 +BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.8 -Requires: yast2 >= 2.16.36 -Requires: yast2-core yast2-xml libxslt -Requires: autoyast2-installation = %{version} -Requires: yast2-schema yast2 yast2-country yast2-storage -Requires: yast2-storage >= 2.19.13 -Requires: yast2-transfer >= 2.21.0 +Requires: yast2 >= 2.16.36 +Requires: yast2-core yast2-xml libxslt +Requires: autoyast2-installation = %{version} +Requires: yast2-schema yast2 yast2-country yast2-storage +Requires: yast2-storage >= 2.19.13 +Requires: yast2-transfer >= 2.21.0 -Provides: yast2-module-autoinst yast2-config-autoinst -Obsoletes: yast2-module-autoinst yast2-config-autoinst -Provides: yast2-lib-autoinst -Obsoletes: yast2-lib-autoinst +Provides: yast2-module-autoinst yast2-config-autoinst +Obsoletes: yast2-module-autoinst yast2-config-autoinst +Provides: yast2-lib-autoinst +Obsoletes: yast2-lib-autoinst -PreReq: %insserv_prereq %fillup_prereq +PreReq: %insserv_prereq %fillup_prereq -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - Automated Installation +Summary: YaST2 - Automated Installation %description This package is intended for management of the control files and the @@ -65,26 +51,23 @@ This file contains YaST2-independent files needed to create installation sources. %package installation - -Version: 2.21.0 -Release: 1 -Summary: YaST2 - Auto Installation Modules -Group: System/YaST +Version: 2.21.1 +Summary: YaST2 - Auto Installation Modules +Group: System/YaST # API for Disabled Modules (ProductControl) -Requires: yast2 >= 2.16.36 +Requires: yast2 >= 2.16.36 # After API cleanup -Requires: yast2-update >= 2.18.3 -Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp -Requires: yast2-transfer >= 2.21.0 -Provides: yast2-trans-autoinst -Obsoletes: yast2-trans-autoinst - +Requires: yast2-update >= 2.18.3 +Requires: yast2-xml yast2-core yast2 yast2-country yast2-mouse yast2-packager yast2-storage yast2-transfer yast2-slp +Requires: yast2-transfer >= 2.21.0 +Provides: yast2-trans-autoinst +Obsoletes: yast2-trans-autoinst %description installation This package performs auto-installation relying on a control file generated with the autoyast2 package. %prep -%setup -n autoyast2-2.21.0 +%setup -n autoyast2-2.21.1 %build %{prefix}/bin/y2tool y2autoconf @@ -135,6 +118,7 @@ rm -rf "$RPM_BUILD_ROOT" %post %{fillup_only -n autoinstall} + %files %defattr(-,root,root) %dir /etc/autoinstall @@ -146,6 +130,7 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/lib/autoinstall/tmp %doc %{prefix}/share/doc/packages/autoyast2 + %{prefix}/share/applications/YaST2/autoyast.desktop /usr/share/autoinstall/modules/*.desktop /usr/share/YaST2/include/autoinstall/classes.ycp @@ -170,14 +155,18 @@ rm -rf "$RPM_BUILD_ROOT" /usr/share/YaST2/scrconf/ksimport.scr + /usr/share/YaST2/modules/AutoinstClass.y* /usr/share/YaST2/modules/Kickstart.y* /usr/lib/YaST2/servers_non_y2/ag_ksimport + + # additional files /var/adm/fillup-templates/sysconfig.autoinstall + %files installation %defattr(-,root,root) /usr/share/YaST2/scrconf/autoinstall.scr @@ -249,6 +238,7 @@ rm -rf "$RPM_BUILD_ROOT" # scripts %{prefix}/lib/YaST2/bin/fetch_image.sh + %dir /var/adm/autoinstall/ %dir /var/adm/autoinstall/scripts %dir /var/adm/autoinstall/init.d @@ -257,4 +247,5 @@ rm -rf "$RPM_BUILD_ROOT" %dir /var/adm/autoinstall/cache %dir /var/lib/autoinstall %dir /var/lib/autoinstall/autoconf -%changelog + +