Skip to content

Commit

Permalink
- Use /etc/products.d/openSUSE.prod as /etc/products.d/baseproduct
Browse files Browse the repository at this point in the history
  (boo#1011147)
- Requires yast2-qt-branding instead of yast2-qt-branding-openSUSE
- 3.1.11
  • Loading branch information
embar- committed Jun 5, 2017
1 parent c2ad6e7 commit efb11dd
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 21 deletions.
12 changes: 11 additions & 1 deletion package/yast2-live-installer.changes
@@ -1,9 +1,18 @@
-------------------------------------------------------------------
Mon Jun 5 20:12:52 UTC 2017 - opensuse.lietuviu.kalba@gmail.com

- Use /etc/products.d/openSUSE.prod as /etc/products.d/baseproduct
(boo#1011147)
- Requires yast2-qt-branding instead of yast2-qt-branding-openSUSE
- 3.1.11

-------------------------------------------------------------------
Fri Jul 29 09:48:41 UTC 2016 - cyberorg@opensuse.org

- remove mkinitrd workaround from correct_live_for_reboot,
not needed anymore
- boo #991084
- boo #991084
- 3.1.10

-------------------------------------------------------------------
Thu Jul 28 13:03:03 UTC 2016 - cyberorg@opensuse.org
Expand All @@ -12,6 +21,7 @@ Thu Jul 28 13:03:03 UTC 2016 - cyberorg@opensuse.org
these scripts are required to get yast2-live-installer function,
the scripts belong in this package
- Added Requires for yast modules needed by live-installer
- 3.1.9

-------------------------------------------------------------------
Tue Jun 7 08:21:02 UTC 2016 - igonzalezsosa@suse.com
Expand Down
51 changes: 31 additions & 20 deletions package/yast2-live-installer.spec
@@ -1,7 +1,7 @@
#
# spec file for package yast2-live-installer
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand All @@ -17,33 +17,35 @@


Name: yast2-live-installer
Version: 3.1.10
Version: 3.1.11
Release: 0

Summary: YaST2 - Installation from Live Media
Group: System/YaST
License: GPL-2.0+
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Source1: correct_live_for_reboot
Source2: correct_live_install
Group: System/YaST
License: GPL-2.0+

BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
BuildRequires: yast2
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-testsuite
# Internet and InternetDevices
Requires: yast2 >= 2.16.6
Requires: yast2-network >= 2.16.6
Requires: yast2-bootloader >= 2.18.7
#unified progress
Requires: yast2-installation >= 2.18.17
Requires: yast2-qt-branding-openSUSE
Requires: yast2 >= 2.16.6
Requires: yast2-bootloader >= 2.18.7
Requires: yast2-network >= 2.16.6
# unified progress
Requires: yast2-bootloader
Requires: yast2-country
Requires: yast2-installation >= 2.18.17
Requires: yast2-qt-branding
Requires: yast2-storage
Requires: yast2-users
Requires: yast2-bootloader yast2-country yast2-storage
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite
BuildRequires: yast2-devtools >= 3.1.10

BuildArchitectures: noarch

Requires: yast2-ruby-bindings >= 1.0.0

Summary: YaST2 - Installation from Live Media
# openSUSE-release contains /etc/products.d/openSUSE.prod (boo#1011147)
Requires: openSUSE-release

%description
This package contains the YaST component to deploy a live media to the
Expand All @@ -62,6 +64,13 @@ cp %{SOURCE1} %{buildroot}/%_bindir/
cp %{SOURCE2} %{buildroot}/%_bindir/
chmod 755 %{buildroot}/%_bindir/*

%post
if [ -f /etc/products.d/baseproduct ] ; then
rm /etc/products.d/baseproduct
fi
if [ -f /etc/products.d/openSUSE.prod ] ; then
ln -s /etc/products.d/openSUSE.prod /etc/products.d/baseproduct
fi
%files
%defattr(-,root,root)
%{yast_clientdir}/*.rb
Expand All @@ -70,3 +79,5 @@ chmod 755 %{buildroot}/%_bindir/*
%_bindir/correct_live_for_reboot
%_bindir/correct_live_install
%doc %{yast_docdir}

%changelog

0 comments on commit efb11dd

Please sign in to comment.