From c35b962bc196a38d5c4bcf09e4ed0d114e4958460fd2cf6ec59104af075978f8 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Wed, 2 Jun 2010 12:07:33 +0000 Subject: [PATCH 1/5] 2,7d1 < Wed Jun 2 13:52:02 CEST 2010 - jsrain@suse.cz < < - removed link to repairing the system < - 2.19.20 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=67 --- yast2-installation-2.19.20.tar.bz2 | 3 + yast2-installation-2.19.7.tar.bz2 | 3 - yast2-installation.changes | 6 ++ yast2-installation.spec | 105 +++++++++++++---------------- 4 files changed, 54 insertions(+), 63 deletions(-) create mode 100644 yast2-installation-2.19.20.tar.bz2 delete mode 100644 yast2-installation-2.19.7.tar.bz2 diff --git a/yast2-installation-2.19.20.tar.bz2 b/yast2-installation-2.19.20.tar.bz2 new file mode 100644 index 0000000..f0745cf --- /dev/null +++ b/yast2-installation-2.19.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cfb0ca70fb47e1416a567533124103f84e6f37731c0ab2f538068a5e76d3f02 +size 309283 diff --git a/yast2-installation-2.19.7.tar.bz2 b/yast2-installation-2.19.7.tar.bz2 deleted file mode 100644 index cfd2288..0000000 --- a/yast2-installation-2.19.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45c6ea8039962ef54d14404206b7870c1a3989f4f8fddc9612c1a8263fc5306d -size 276405 diff --git a/yast2-installation.changes b/yast2-installation.changes index 3412774..7738bc9 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 2 13:52:02 CEST 2010 - jsrain@suse.cz + +- removed link to repairing the system +- 2.19.20 + ------------------------------------------------------------------- Wed May 12 15:33:24 CEST 2010 - ug@suse.de diff --git a/yast2-installation.spec b/yast2-installation.spec index d5d5cdd..680e28e 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,78 +1,65 @@ # -# spec file for package yast2-installation (Version 2.19.7) +# spec file for package yast2-installation (Version 2.19.20) # -# Copyright (c) 2010 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.19.7 -Release: 1 +Name: yast2-installation +Version: 2.19.20 +Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.19.7.tar.bz2 -Prefix: /usr +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.19.20.tar.bz2 -Group: System/YaST -License: GPLv2+ +prefix: /usr + +Group: System/YaST +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 +BuildRequires: yast2-pkg-bindings >= 2.17.25 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -81,20 +68,20 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils # for the first/second stage of installation # currently not used @@ -103,31 +90,30 @@ Requires: coreutils #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArch: noarch +BuildArchitectures: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %package devel-doc -License: GPLv2+ Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -136,7 +122,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.19.7 +%setup -n yast2-installation-2.19.20 %build %{prefix}/bin/y2tool y2autoconf @@ -217,4 +203,3 @@ rm -rf "$RPM_BUILD_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 From 5066278f1fe7cd3f2fd4c46db06737f1948e2dffaaf5e3403fbfb59fff8416a3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 2 Jun 2010 14:00:10 +0000 Subject: [PATCH 2/5] Accepting request 40985 from YaST:Head checked in (request 40985) OBS-URL: https://build.opensuse.org/request/show/40985 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=68 --- yast2-installation-2.19.20.tar.bz2 | 3 - yast2-installation-2.19.7.tar.bz2 | 3 + yast2-installation.changes | 6 -- yast2-installation.spec | 105 ++++++++++++++++------------- 4 files changed, 63 insertions(+), 54 deletions(-) delete mode 100644 yast2-installation-2.19.20.tar.bz2 create mode 100644 yast2-installation-2.19.7.tar.bz2 diff --git a/yast2-installation-2.19.20.tar.bz2 b/yast2-installation-2.19.20.tar.bz2 deleted file mode 100644 index f0745cf..0000000 --- a/yast2-installation-2.19.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cfb0ca70fb47e1416a567533124103f84e6f37731c0ab2f538068a5e76d3f02 -size 309283 diff --git a/yast2-installation-2.19.7.tar.bz2 b/yast2-installation-2.19.7.tar.bz2 new file mode 100644 index 0000000..cfd2288 --- /dev/null +++ b/yast2-installation-2.19.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c6ea8039962ef54d14404206b7870c1a3989f4f8fddc9612c1a8263fc5306d +size 276405 diff --git a/yast2-installation.changes b/yast2-installation.changes index 7738bc9..3412774 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Jun 2 13:52:02 CEST 2010 - jsrain@suse.cz - -- removed link to repairing the system -- 2.19.20 - ------------------------------------------------------------------- Wed May 12 15:33:24 CEST 2010 - ug@suse.de diff --git a/yast2-installation.spec b/yast2-installation.spec index 680e28e..d5d5cdd 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,65 +1,78 @@ # -# spec file for package yast2-installation (Version 2.19.20) +# spec file for package yast2-installation (Version 2.19.7) # +# Copyright (c) 2010 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.19.20 -Release: 0 +Name: yast2-installation +Version: 2.19.7 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.19.7.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.19.20.tar.bz2 +Prefix: /usr -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 +BuildRequires: yast2-pkg-bindings >= 2.17.25 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -68,20 +81,20 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils # for the first/second stage of installation # currently not used @@ -90,30 +103,31 @@ Requires: coreutils #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %package devel-doc +License: GPLv2+ Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -122,7 +136,7 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.19.20 +%setup -n yast2-installation-2.19.7 %build %{prefix}/bin/y2tool y2autoconf @@ -203,3 +217,4 @@ rm -rf "$RPM_BUILD_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 From b0f1b8bc0ba5267d1224db5cd7fc07979d0e4786f07e0afa88508e225a559e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 30 Sep 2010 17:46:28 +0000 Subject: [PATCH 3/5] 2,7d1 < Thu Sep 30 17:33:48 UTC 2010 - lslezak@suse.cz < < - don't use spaces in repo alias (bnc#596950) < - 2.20.0 < < ------------------------------------------------------------------- OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=69 --- yast2-installation-2.19.7.tar.bz2 | 3 - yast2-installation.changes | 12 ++ yast2-installation.spec | 220 ------------------------------ 3 files changed, 12 insertions(+), 223 deletions(-) delete mode 100644 yast2-installation-2.19.7.tar.bz2 delete mode 100644 yast2-installation.spec diff --git a/yast2-installation-2.19.7.tar.bz2 b/yast2-installation-2.19.7.tar.bz2 deleted file mode 100644 index cfd2288..0000000 --- a/yast2-installation-2.19.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45c6ea8039962ef54d14404206b7870c1a3989f4f8fddc9612c1a8263fc5306d -size 276405 diff --git a/yast2-installation.changes b/yast2-installation.changes index 3412774..2560b70 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 30 17:33:48 UTC 2010 - lslezak@suse.cz + +- don't use spaces in repo alias (bnc#596950) +- 2.20.0 + +------------------------------------------------------------------- +Wed Jun 2 13:52:02 CEST 2010 - jsrain@suse.cz + +- removed link to repairing the system +- 2.19.20 + ------------------------------------------------------------------- Wed May 12 15:33:24 CEST 2010 - ug@suse.de diff --git a/yast2-installation.spec b/yast2-installation.spec deleted file mode 100644 index d5d5cdd..0000000 --- a/yast2-installation.spec +++ /dev/null @@ -1,220 +0,0 @@ -# -# spec file for package yast2-installation (Version 2.19.7) -# -# Copyright (c) 2010 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.19.7 -Release: 1 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.19.7.tar.bz2 - -Prefix: /usr - -Group: System/YaST -License: GPLv2+ -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite - -# FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 - -# xmllint -BuildRequires: libxml2 - -# to convert control.rnc o control.rng -BuildRequires: trang - -# PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 - -# Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 - -# Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 - -# AutoinstConfig::getProposalList -Requires: autoyast2-installation >= 2.17.1 - -# ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 - -# Language::GetLanguageItems and other API -# Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 - -# Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 - -# Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 - -# New API for ProductLicense -Requires: yast2-packager >= 2.19.2 - -# FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 - -# use in startup scripts -Requires: initviocons - -# Only in inst-sys -# Requires: yast2-network -# Requires: yast2-add-on -# Requires: yast2-update - -# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile -# pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 - -# InstError -Conflicts: yast2 < 2.18.6 - -# Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 - -# ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 - -# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils - -# for the first/second stage of installation -# currently not used -# bugzilla #208307 -#Requires: /usr/bin/jpegtopnm -#Requires: /usr/bin/pnmtopng - -# BNC 446533, /sbin/lspci called but not installed -Requires: pciutils - -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on - -PreReq: %fillup_prereq - -BuildArch: noarch - -Summary: YaST2 - Installation Parts - -%package devel-doc -License: GPLv2+ -Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 - -PreReq: %fillup_prereq - -Summary: YaST2 - Installation Parts - -%description -System installation code as present on installation media. - -%description devel-doc -System installation code as present on installation media. - -%prep -%setup -n yast2-installation-2.19.7 - -%build -%{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} -# 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 - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done - -for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; do - %suse_update_desktop_file $f -done - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%post -%{fillup_only -ns security checksig} - -%files -%defattr(-,root,root) -%dir /usr/share/YaST2/control -/usr/share/YaST2/control/*.xml -# Fixme: move to another package (to make build of other packages faster) -/usr/share/YaST2/control/*.rng -/usr/share/YaST2/control/*.rnc - -/usr/share/YaST2/clients/*.ycp -/usr/share/YaST2/modules/*.ycp -/usr/share/YaST2/modules/*.ybc -%{prefix}/share/applications/YaST2/*.desktop -/usr/share/autoinstall/modules/*.desktop -/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc -%dir /usr/share/autoinstall -%dir /usr/share/autoinstall/modules -%dir /usr/share/YaST2/include/installation -/usr/share/YaST2/include/installation/* - -# agents -/usr/share/YaST2/scrconf/etc_passwd.scr -/usr/share/YaST2/scrconf/cfg_boot.scr -/usr/share/YaST2/scrconf/cfg_windowmanager.scr -/usr/share/YaST2/scrconf/cfg_fam.scr -/usr/share/YaST2/scrconf/etc_install_inf.scr -/usr/share/YaST2/scrconf/etc_install_inf_alias.scr -/usr/share/YaST2/scrconf/etc_install_inf_options.scr -/usr/share/YaST2/scrconf/proc_modules.scr -/usr/share/YaST2/scrconf/run_df.scr -# fillup -/var/adm/fillup-templates/sysconfig.security-checksig - -# programs and scripts -%{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 - -%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 From 58b3761bfe7949c0e1e405b6a47d51b752d0ace0a2d00b7b1f144039c264b9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 30 Sep 2010 18:12:03 +0000 Subject: [PATCH 4/5] 5d4 < - inst_addon_update_sources.ycp - removed obsoleted ZMD sync call OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=70 --- yast2-installation-2.20.0.tar.bz2 | 3 + yast2-installation.changes | 1 + yast2-installation.spec | 205 ++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100644 yast2-installation-2.20.0.tar.bz2 create mode 100644 yast2-installation.spec diff --git a/yast2-installation-2.20.0.tar.bz2 b/yast2-installation-2.20.0.tar.bz2 new file mode 100644 index 0000000..7bd5c14 --- /dev/null +++ b/yast2-installation-2.20.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98bb2e49465e2796c3eb20da78aa086bbdb5530261d118dc6bfcb20cfe6b79de +size 274692 diff --git a/yast2-installation.changes b/yast2-installation.changes index 2560b70..46bea64 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -2,6 +2,7 @@ Thu Sep 30 17:33:48 UTC 2010 - lslezak@suse.cz - don't use spaces in repo alias (bnc#596950) +- inst_addon_update_sources.ycp - removed obsoleted ZMD sync call - 2.20.0 ------------------------------------------------------------------- diff --git a/yast2-installation.spec b/yast2-installation.spec new file mode 100644 index 0000000..dd93bea --- /dev/null +++ b/yast2-installation.spec @@ -0,0 +1,205 @@ +# +# spec file for package yast2-installation (Version 2.20.0) +# +# norootforbuild + + +Name: yast2-installation +Version: 2.20.0 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.20.0.tar.bz2 + +prefix: /usr + +Group: System/YaST +License: GPL v2 or later +BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite + +# FileSystems::possible_root_fs +BuildRequires: yast2-storage >= 2.19.12 + +# xmllint +BuildRequires: libxml2 + +# to convert control.rnc o control.rng +BuildRequires: trang + +# PackageCallbacks::RegisterEmptyProgressCallbacks() +BuildRequires: yast2 >= 2.16.52 + +# Pkg::SourceProvideDigestedFile() +BuildRequires: yast2-pkg-bindings >= 2.17.25 + +# Unified progress bar (done by visnov) +BuildRequires: yast2-packager >= 2.17.9 + +# AutoinstConfig::getProposalList +Requires: autoyast2-installation >= 2.17.1 + +# ProductControl::DisabledACItems, ::DisabledSubProposals +Requires: yast2 >= 2.18.23 + +# Language::GetLanguageItems and other API +# Language::Set (handles downloading the translation extensions) +Requires: yast2-country-data >= 2.16.11 + +# Pkg::SourceProvideDigestedFile() +Conflicts: yast2-pkg-bindings < 2.17.25 + +# Mouse-related scripts moved to yast2-mouse +Conflicts: yast2-mouse < 2.18.0 + +# New API for ProductLicense +Requires: yast2-packager >= 2.19.2 + +# FileSystems::possible_root_fs +Requires: yast2-storage >= 2.19.12 + +# use in startup scripts +Requires: initviocons + +# Only in inst-sys +# Requires: yast2-network +# Requires: yast2-add-on +# Requires: yast2-update + +# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile +# pkg-bindings are not directly required +Conflicts: yast2-pkg-bindings < 2.17.25 + +# InstError +Conflicts: yast2 < 2.18.6 + +# Added new function WFM::ClientExists +Conflicts: yast2-core < 2.17.10 + +# ButtonBox widget +Conflicts: yast2-ycp-ui-bindings < 2.17.3 + +# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) +Requires: tar gzip +Requires: coreutils + +# for the first/second stage of installation +# currently not used +# bugzilla #208307 +#Requires: /usr/bin/jpegtopnm +#Requires: /usr/bin/pnmtopng + +# BNC 446533, /sbin/lspci called but not installed +Requires: pciutils + +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on + +PreReq: %fillup_prereq + +BuildArchitectures: noarch + +Summary: YaST2 - Installation Parts + +%package devel-doc +Group: Documentation/HTML +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts + +%description +System installation code as present on installation media. + +%description devel-doc +System installation code as present on installation media. + +%prep +%setup -n yast2-installation-2.20.0 + +%build +%{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} +# 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 + d=${f##*/} + %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} +done + +for f in `find %{buildroot}%{_datadir}/autoinstall/modules -name "*.desktop"`; do + %suse_update_desktop_file $f +done + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%post +%{fillup_only -ns security checksig} + +%files +%defattr(-,root,root) +%dir /usr/share/YaST2/control +/usr/share/YaST2/control/*.xml +# Fixme: move to another package (to make build of other packages faster) +/usr/share/YaST2/control/*.rng +/usr/share/YaST2/control/*.rnc + +/usr/share/YaST2/clients/*.ycp +/usr/share/YaST2/modules/*.ycp +/usr/share/YaST2/modules/*.ybc +%{prefix}/share/applications/YaST2/*.desktop +/usr/share/autoinstall/modules/*.desktop +/usr/share/YaST2/schema/autoyast/rnc/deploy_image.rnc +%dir /usr/share/autoinstall +%dir /usr/share/autoinstall/modules +%dir /usr/share/YaST2/include/installation +/usr/share/YaST2/include/installation/* + +# agents +/usr/share/YaST2/scrconf/etc_passwd.scr +/usr/share/YaST2/scrconf/cfg_boot.scr +/usr/share/YaST2/scrconf/cfg_windowmanager.scr +/usr/share/YaST2/scrconf/cfg_fam.scr +/usr/share/YaST2/scrconf/etc_install_inf.scr +/usr/share/YaST2/scrconf/etc_install_inf_alias.scr +/usr/share/YaST2/scrconf/etc_install_inf_options.scr +/usr/share/YaST2/scrconf/proc_modules.scr +/usr/share/YaST2/scrconf/run_df.scr +# fillup +/var/adm/fillup-templates/sysconfig.security-checksig + +# programs and scripts +%{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 + +%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 From eb1b6370087ea7a3d22cbc533e90f7fac693cb477742c38c5cd2fe2a03bc74a0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 1 Oct 2010 21:59:17 +0000 Subject: [PATCH 5/5] Accepting request 49593 from YaST:Head checked in (request 49593) OBS-URL: https://build.opensuse.org/request/show/49593 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=71 --- yast2-installation.spec | 101 +++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/yast2-installation.spec b/yast2-installation.spec index dd93bea..36c2ad9 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,65 +1,78 @@ # # spec file for package yast2-installation (Version 2.20.0) # +# Copyright (c) 2010 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.20.0 -Release: 0 +Name: yast2-installation +Version: 2.20.0 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.20.0.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.20.0.tar.bz2 +Prefix: /usr -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Group: System/YaST +License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # FileSystems::possible_root_fs -BuildRequires: yast2-storage >= 2.19.12 +BuildRequires: yast2-storage >= 2.19.12 # xmllint -BuildRequires: libxml2 +BuildRequires: libxml2 # to convert control.rnc o control.rng -BuildRequires: trang +BuildRequires: trang # PackageCallbacks::RegisterEmptyProgressCallbacks() -BuildRequires: yast2 >= 2.16.52 +BuildRequires: yast2 >= 2.16.52 # Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 +BuildRequires: yast2-pkg-bindings >= 2.17.25 # Unified progress bar (done by visnov) -BuildRequires: yast2-packager >= 2.17.9 +BuildRequires: yast2-packager >= 2.17.9 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductControl::DisabledACItems, ::DisabledSubProposals -Requires: yast2 >= 2.18.23 +Requires: yast2 >= 2.18.23 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) -Requires: yast2-country-data >= 2.16.11 +Requires: yast2-country-data >= 2.16.11 # Pkg::SourceProvideDigestedFile() -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # Mouse-related scripts moved to yast2-mouse -Conflicts: yast2-mouse < 2.18.0 +Conflicts: yast2-mouse < 2.18.0 # New API for ProductLicense -Requires: yast2-packager >= 2.19.2 +Requires: yast2-packager >= 2.19.2 # FileSystems::possible_root_fs -Requires: yast2-storage >= 2.19.12 +Requires: yast2-storage >= 2.19.12 # use in startup scripts -Requires: initviocons +Requires: initviocons # Only in inst-sys # Requires: yast2-network @@ -68,20 +81,20 @@ Requires: initviocons # Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile # pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 +Conflicts: yast2-pkg-bindings < 2.17.25 # InstError -Conflicts: yast2 < 2.18.6 +Conflicts: yast2 < 2.18.6 # Added new function WFM::ClientExists -Conflicts: yast2-core < 2.17.10 +Conflicts: yast2-core < 2.17.10 # ButtonBox widget -Conflicts: yast2-ycp-ui-bindings < 2.17.3 +Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip -Requires: coreutils +Requires: tar gzip +Requires: coreutils # for the first/second stage of installation # currently not used @@ -90,30 +103,31 @@ Requires: coreutils #Requires: /usr/bin/pnmtopng # BNC 446533, /sbin/lspci called but not installed -Requires: pciutils +Requires: pciutils -Recommends: yast2-registration -Recommends: yast2-online-update -Recommends: yast2-users -Recommends: yast2-firewall -Recommends: release-notes -Recommends: curl -Recommends: yast2-update -Recommends: yast2-add-on +Recommends: yast2-registration +Recommends: yast2-online-update +Recommends: yast2-users +Recommends: yast2-firewall +Recommends: release-notes +Recommends: curl +Recommends: yast2-update +Recommends: yast2-add-on -PreReq: %fillup_prereq +PreReq: %fillup_prereq -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %package devel-doc +License: GPLv2+ Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 +Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq +PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -203,3 +217,4 @@ rm -rf "$RPM_BUILD_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