diff --git a/yast2-installation-2.19.3.tar.bz2 b/yast2-installation-2.19.3.tar.bz2 new file mode 100644 index 0000000..c3ac4b4 --- /dev/null +++ b/yast2-installation-2.19.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:964d1225497b776b0bd1aa8b98ff919869f0d726eea1acce70170b5f7e2f65b2 +size 276326 diff --git a/yast2-installation-2.19.4.tar.bz2 b/yast2-installation-2.19.4.tar.bz2 deleted file mode 100644 index 84d2d17..0000000 --- a/yast2-installation-2.19.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de980be2f59ffbe5835a5f6b41bb09d5f44f7235ac2b9387d7ac6b7c21869e65 -size 276275 diff --git a/yast2-installation.changes b/yast2-installation.changes index 68c667c..e24dd1e 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,75 +1,5 @@ ------------------------------------------------------------------- -Fri Mar 26 11:26:04 CET 2010 - ug@suse.de - -- fixed a broken yast2-installation.spec.in -- fixed broken schema validation files for control.xml files -- 2.19.4 - -------------------------------------------------------------------- -Wed Mar 24 07:42:19 UTC 2010 - lslezak@suse.cz - -- inst_suseconfig.ycp - do not reset UI product name - (&product; macro) (bnc#539906) - -------------------------------------------------------------------- -Thu Mar 18 14:55:20 CET 2010 - locilka@suse.cz - -- Previously used repositories switched from enabled/disabled mode - to removed/enabled/disabled mode (BNC #588659). - -------------------------------------------------------------------- -Fri Mar 12 13:19:15 CET 2010 - kmachalkova@suse.cz - -- Port from SLE11 SP1: process files in _datadir/autoinstall/modules - with %suse_update_desktop_file. This passes their strings into - translation (bnc#549944) - -------------------------------------------------------------------- -Fri Mar 12 10:53:55 CET 2010 - locilka@suse.cz - -- Unique identification in inst_upgrade_urls switched from URL to - ALIAS (BNC #587517). -- In case of re-adding CD/DVD media, user is asked to insert - correct media before adding it (BNC #587517). -- Only upgrade packages if upgrading from SLES 11, otherwise use - patterns for upgrade (BNC #587544). - -------------------------------------------------------------------- -Tue Mar 9 15:35:48 CET 2010 - locilka@suse.cz - -- Fixed calling update.post from DUD (BNC #586609). - -------------------------------------------------------------------- -Tue Mar 2 14:30:31 CET 2010 - locilka@suse.cz - -- CIM service is proposed as disabled by default (BNC #584524). - -------------------------------------------------------------------- -Mon Feb 22 17:48:57 CET 2010 - locilka@suse.cz - -- Documented YaST RELAX NG schema (FATE #305551). -- Correctly re-added unique_id to RNC - AC steps and proposals - (BNC #582094). - -------------------------------------------------------------------- -Wed Feb 17 11:05:12 CET 2010 - ug@suse.de - -- clone checkbox at the end of the installation is always - enabled now and can install the autoyast2 package if needed - (bnc#547486) - -------------------------------------------------------------------- -Mon Feb 15 15:48:51 CET 2010 - ug@suse.de - -- UI for autoinstallation images added to deploy_image_auto - -------------------------------------------------------------------- -Tue Feb 9 17:06:15 CET 2010 - locilka@suse.cz - -- Steps 'user' and 'auth' enabled again in Live mode (BNC #547931). - -------------------------------------------------------------------- -Tue Feb 9 14:49:33 CET 2010 - locilka@suse.cz +Tue Feb 9 14:49:33 CET 2010 - locilka@ssue.cz - Fixed license agreement check box visibility (BNC #571846). - 2.19.3 diff --git a/yast2-installation.spec b/yast2-installation.spec index 518a112..a9cc36c 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -1,116 +1,100 @@ # -# spec file for package yast2-installation (Version 2.19.4) +# spec file for package yast2-installation (Version 2.19.3) # +# 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.4 -Release: 0 - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.19.4.tar.bz2 - -prefix: /usr - -Group: System/YaST -License: GPL v2 or later +Name: yast2-installation +Version: 2.19.3 +Release: 1 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-installation-2.19.3.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 - # 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 # 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 - -BuildArchitectures: 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 +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 +Requires: yast2-installation >= 2.15.34 +PreReq: %fillup_prereq +Summary: YaST2 - Installation Parts %description System installation code as present on installation media. @@ -119,16 +103,14 @@ System installation code as present on installation media. System installation code as present on installation media. %prep -%setup -n yast2-installation-2.19.4 +%setup -n yast2-installation-2.19.3 %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) @@ -143,10 +125,6 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk %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" @@ -160,18 +138,16 @@ 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 %{prefix}/share/applications/YaST2/*.desktop -/usr/share/autoinstall/modules/*.desktop +/usr/share/autoinstall/modules/deploy_image.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 @@ -184,13 +160,10 @@ 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 @@ -200,3 +173,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