ref: refs/heads/master
commit 7a3e6f141293cf008591b82029e33d285dcee181
Author: Martin Kudlvasr
Date: Thu Nov 5 11:36:07 2009 +0100
use only sles11 license for now
---
plugins/eulas/package/eulas-opensuse11_1.yml | 2 ++
plugins/eulas/package/eulas-sles11.yml | 2 ++
plugins/eulas/package/eulas.yml | 3 ---
plugins/eulas/package/yast2-webservice-eulas.spec | 5 +++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/plugins/eulas/package/eulas-opensuse11_1.yml b/plugins/eulas/package/eulas-opensuse11_1.yml
new file mode 100644
index 0000000..ff0d7ca
--- /dev/null
+++ b/plugins/eulas/package/eulas-opensuse11_1.yml
@@ -0,0 +1,2 @@
+licenses:
+ - openSUSE-11.1
diff --git a/plugins/eulas/package/eulas-sles11.yml b/plugins/eulas/package/eulas-sles11.yml
new file mode 100644
index 0000000..def0d89
--- /dev/null
+++ b/plugins/eulas/package/eulas-sles11.yml
@@ -0,0 +1,2 @@
+licenses:
+ - SLES-11
diff --git a/plugins/eulas/package/eulas.yml b/plugins/eulas/package/eulas.yml
deleted file mode 100644
index bc859e5..0000000
--- a/plugins/eulas/package/eulas.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-licenses:
- - openSUSE-11.1
- - SLES-11
diff --git a/plugins/eulas/package/yast2-webservice-eulas.spec b/plugins/eulas/package/yast2-webservice-eulas.spec
index dc0b644..e55c353 100644
--- a/plugins/eulas/package/yast2-webservice-eulas.spec
+++ b/plugins/eulas/package/yast2-webservice-eulas.spec
@@ -19,7 +19,7 @@ Version: 0.0.2
Release: 0
Summary: YaST2 - Webservice - EULA
Source: www.tar.bz2
-Source1: eulas.yml
+Source1: eulas-sles11.yml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: rubygem-mocha
@@ -49,6 +49,7 @@ Authors:
# Install all web and frontend parts.
#
mkdir -p $RPM_BUILD_ROOT/usr/share/%{pkg_user}/%{plugin_name}
+rm -r "config/resources/licenses/openSUSE-11.1"
mv config/resources/licenses $RPM_BUILD_ROOT/usr/share/%{pkg_user}/%{plugin_name}/
mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkg_user}/%{plugin_name}/accepted-licenses
@@ -59,7 +60,7 @@ rm -f $RPM_BUILD_ROOT/srv/www/%{pkg_user}/vendor/plugins/%{plugin_name}/COPYING
#FIXME maybe location change in future
mkdir -p $RPM_BUILD_ROOT/etc/webyast/
-cp %SOURCE1 $RPM_BUILD_ROOT/etc/webyast/
+cp %SOURCE1 $RPM_BUILD_ROOT/etc/webyast/eulas.yml
%clean
rm -rf $RPM_BUILD_ROOT
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Martin Kudlvasr