diff --git a/yast2-installation-2.18.22.tar.bz2 b/yast2-installation-2.18.22.tar.bz2 deleted file mode 100644 index bbf263c..0000000 --- a/yast2-installation-2.18.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:161be9281713d6283a329d082e695a5ba1eb87e557975404d7f0f66584736bf4 -size 260166 diff --git a/yast2-installation-2.18.23.tar.bz2 b/yast2-installation-2.18.23.tar.bz2 new file mode 100644 index 0000000..2791f85 --- /dev/null +++ b/yast2-installation-2.18.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77b8e14e4066e7bd54d9e9ced98767ebbb6300ee4e19be72e80935e9c1f3fb80 +size 261871 diff --git a/yast2-installation.changes b/yast2-installation.changes index b49dee0..16788a3 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 26 15:33:51 CEST 2009 - locilka@suse.cz + +- Do not copy xorg.conf to installed system anymore (bnc #441404). +- 2.18.23 + ------------------------------------------------------------------- Fri Aug 21 12:38:42 CEST 2009 - aschnell@suse.de diff --git a/yast2-installation.spec b/yast2-installation.spec index a822192..d58d774 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,100 +1,116 @@ # -# spec file for package yast2-installation (Version 2.18.22) +# spec file for package yast2-installation (Version 2.18.23) # -# Copyright (c) 2009 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.18.22 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.22.tar.bz2 -Prefix: /usr -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.18.23 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.18.23.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 + # 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 + # `reboot_same_step, .proc.mounts -Requires: yast2 >= 2.18.16 +Requires: yast2 >= 2.18.16 + # 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 + # BNC #449818: "description_id" in DefaultDesktop -Requires: yast2-packager >= 2.17.49 +Requires: yast2-packager >= 2.17.49 + # Storage::GetCommitInfos() call in include/misc.ycp -Requires: yast2-storage >= 2.18.0 +Requires: yast2-storage >= 2.18.0 + # use in startup scripts -Requires: initviocons +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 +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 # 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 +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 -License: GPL v2 or later Group: Documentation/HTML -Requires: yast2-installation >= 2.15.34 -PreReq: %fillup_prereq -Summary: YaST2 - Installation Parts +Requires: yast2-installation >= 2.15.34 + +PreReq: %fillup_prereq + +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -103,14 +119,16 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.18.22 +%setup -n yast2-installation-2.18.23 %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) @@ -125,6 +143,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %clean rm -rf "$RPM_BUILD_ROOT" @@ -138,6 +157,7 @@ rm -rf "$RPM_BUILD_ROOT" # 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 @@ -148,6 +168,7 @@ rm -rf "$RPM_BUILD_ROOT" %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_windowmanager.scr @@ -159,10 +180,13 @@ rm -rf "$RPM_BUILD_ROOT" /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 @@ -172,4 +196,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