Hello community,
here is the log from the commit of package webyast-licenses-ws for
openSUSE:Factory
checked in at Thu May 19 13:30:38 CEST 2011.
--------
--- webyast-licenses-ws/webyast-licenses-ws.changes 2011-04-12
15:10:25.000000000 +0200
+++
/mounts/work_src_done/STABLE/webyast-licenses-ws/webyast-licenses-ws.changes
2011-05-16 12:11:19.000000000 +0200
@@ -1,0 +2,12 @@
+Mon May 16 10:10:10 UTC 2011 - [email protected]
+
+- changed licence to the correct name GPL-2.0
+- 0.2.5
+
+-------------------------------------------------------------------
+Fri Apr 29 13:49:31 CEST 2011 - [email protected]
+
+- include license based on build repo (bnc#689901)
+- 0.2.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-licenses-ws.spec ++++++
--- /var/tmp/diff_new_pack.95pEcJ/_old 2011-05-19 13:30:23.000000000 +0200
+++ /var/tmp/diff_new_pack.95pEcJ/_new 2011-05-19 13:30:23.000000000 +0200
@@ -22,11 +22,11 @@
Provides: yast2-webservice-eulas = %{version}
Obsoletes: yast2-webservice-eulas < %{version}
PreReq: yast2-webservice
-License: GPLv2
+License: GPL-2.0
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.3
+Version: 0.2.5
Release: 1
Summary: WebYaST - license management service
Source: www.tar.bz2
@@ -45,7 +45,7 @@
#
%package testsuite
-License: GPLv2
+
Group: Productivity/Networking/Web/Utilities
Requires: %{name} = %{version}
Requires: webyast-base-ws-testsuite
@@ -83,15 +83,21 @@
# Install all web and frontend parts.
#
mkdir -p $RPM_BUILD_ROOT/usr/share/%{webyast_ws_user}/%{plugin_name}
-%if 0%{?sles_version} == 0
+
+#sles_version does not exist any more (bnc#689901)
+#to use openSUSE license, the OBS project must be named accordingly
+case "%{_project}" in
+ *openSUSE:*)
# use an openSUSE license by default
SOURCE_CONFIG=%SOURCE3
rm -r "config/resources/licenses/SLES-11"
-%else
+ ;;
+ *)
# use a sles11 license by default
SOURCE_CONFIG=%SOURCE1
rm -r "config/resources/licenses/openSUSE-11.1"
-%endif
+ ;;
+esac
mv config/resources/licenses
$RPM_BUILD_ROOT/usr/share/%{webyast_ws_user}/%{plugin_name}/
mkdir -p $RPM_BUILD_ROOT%{webyast_ws_vardir}/%{plugin_name}/accepted-licenses
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/www/app/models/license.rb
new/www/app/models/license.rb
--- old/www/app/models/license.rb 2010-09-15 18:06:30.000000000 +0200
+++ new/www/app/models/license.rb 2011-05-16 14:32:56.000000000 +0200
@@ -135,8 +135,8 @@
##
# Load license translation from disk
- # @raise [CorruptedFileException] in case license translation name does not
exist
- # @param [String] lang lang or locale code of the desired license translation
+ # @raise [CorruptedFileException] in case license translation name does not
exist
+ # @param [String] lang lang or locale code of the desired license
translation
# @return [nil] @text and @text_lang instance variables are set
def load_text(lang)
lang = make_lang_acceptable lang
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
