Hello community,
here is the log from the commit of package yast2-metapackage-handler for
openSUSE:Factory checked in at 2018-02-14 09:17:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-metapackage-handler (Old)
and /work/SRC/openSUSE:Factory/.yast2-metapackage-handler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-metapackage-handler"
Wed Feb 14 09:17:43 2018 rev:50 rq:576055 version:4.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-metapackage-handler/yast2-metapackage-handler.changes
2015-05-19 23:26:38.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-metapackage-handler.new/yast2-metapackage-handler.changes
2018-02-14 09:17:44.569660304 +0100
@@ -1,0 +2,7 @@
+Tue Feb 13 11:46:30 UTC 2018 - [email protected]
+
+- don't use inline html styles when including package metadata
+ (bsc#1080792)
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
yast2-metapackage-handler-3.1.4.tar.bz2
New:
----
yast2-metapackage-handler-4.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.zblKmZ/_old 2018-02-14 09:17:45.161638845 +0100
+++ /var/tmp/diff_new_pack.zblKmZ/_new 2018-02-14 09:17:45.165638700 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-metapackage-handler
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -17,7 +17,7 @@
Name: yast2-metapackage-handler
-Version: 3.1.4
+Version: 4.0.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-metapackage-handler-3.1.4.tar.bz2 ->
yast2-metapackage-handler-4.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-3.1.4/.travis.yml
new/yast2-metapackage-handler-4.0.0/.travis.yml
--- old/yast2-metapackage-handler-3.1.4/.travis.yml 2015-05-15
10:34:07.345531648 +0200
+++ new/yast2-metapackage-handler-4.0.0/.travis.yml 2018-02-13
13:08:50.000000000 +0100
@@ -1,14 +1,11 @@
-language: cpp
-compiler:
- - gcc
+sudo: required
+language: bash
+services:
+ - docker
+
before_install:
- # disable rvm, use system Ruby
- - rvm reset
- - wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "yast2-devtools yast2-testsuite yast2"
+ - docker build -t yast-metapackage-handler-image .
script:
- - make -f Makefile.cvs
- - make
- - sudo make install
- - make check
-
+ # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+ # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID"
yast-metapackage-handler-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-3.1.4/.yardopts
new/yast2-metapackage-handler-4.0.0/.yardopts
--- old/yast2-metapackage-handler-3.1.4/.yardopts 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-4.0.0/.yardopts 2018-02-13
13:08:50.000000000 +0100
@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-3.1.4/CONTRIBUTING.md
new/yast2-metapackage-handler-4.0.0/CONTRIBUTING.md
--- old/yast2-metapackage-handler-3.1.4/CONTRIBUTING.md 2015-05-15
10:34:07.349531648 +0200
+++ new/yast2-metapackage-handler-4.0.0/CONTRIBUTING.md 2018-02-13
13:08:50.000000000 +0100
@@ -3,7 +3,7 @@
YaST is an open source project and as such it welcomes all kinds of
contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and YaST maintainers.
+ensure the process is effective and pleasant both for you and the YaST
maintainers.
There are two main forms of contribution: reporting bugs and performing code
changes.
@@ -17,13 +17,11 @@
registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
if you don't have an account yet.)
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee
-that every bug will be fixed, but we'll try.
-
When creating a bug report, please follow our [bug reporting
guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+We can't guarantee that every bug will be fixed, but we'll try.
+
Code Changes
------------
@@ -44,15 +42,22 @@
to the [Ruby style
guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
- 4. Make sure your change didn't break anything by building the RPM package
+ 4. Update the package version (in `packages/*.spec`, usually by
+ `rake version:bump`) and add a new entry to the `package/*.changes` file
+ (by `osc vc package`).
+ For bigger changes or changes which need longer discussion it is advised
to
+ add this as a separate last commit so it can be easily updated when
another
+ change is merged in the meantime.
+
+ 5. Make sure your change didn't break anything by building the RPM package
(`rake osc:build`). The build process includes running the full testsuite.
- 5. Publish the branch and create a pull request.
+ 6. Publish the branch and create a pull request.
- 6. YaST developers will review your change and possibly point out issues.
+ 7. YaST developers will review your change and possibly point out issues.
Adapt the code under their guidance until they are all resolved.
- 7. Finally, the pull request will get merged or rejected.
+ 8. Finally, the pull request will get merged or rejected.
See also [GitHub's guide on
contributing](https://help.github.com/articles/fork-a-repo).
@@ -60,9 +65,6 @@
If you want to do multiple unrelated changes, use separate branches and pull
requests.
-Do not change the `VERSION` and `*.changes` files as this could lead to
-conflicts.
-
### Commits
Each commit in the pull request should do only one thing, which is clearly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-3.1.4/Dockerfile
new/yast2-metapackage-handler-4.0.0/Dockerfile
--- old/yast2-metapackage-handler-3.1.4/Dockerfile 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-metapackage-handler-4.0.0/Dockerfile 2018-02-13
13:08:50.000000000 +0100
@@ -0,0 +1,3 @@
+FROM yastdevel/ruby
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-3.1.4/README.md
new/yast2-metapackage-handler-4.0.0/README.md
--- old/yast2-metapackage-handler-3.1.4/README.md 2015-05-15
10:34:07.349531648 +0200
+++ new/yast2-metapackage-handler-4.0.0/README.md 2018-02-13
13:08:50.000000000 +0100
@@ -1,5 +1,5 @@
# YaST - The One Click Installer Module #
-[](https://travis-ci.org/yast/yast-metapackage)
-[](https://ci.opensuse.org/view/Yast/job/yast-metapackage-master/)
+[](https://travis-ci.org/yast/yast-metapackage-handler)
+[](https://ci.opensuse.org/view/Yast/job/yast-metapackage-handler-master/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-3.1.4/package/yast2-metapackage-handler.changes
new/yast2-metapackage-handler-4.0.0/package/yast2-metapackage-handler.changes
---
old/yast2-metapackage-handler-3.1.4/package/yast2-metapackage-handler.changes
2015-05-15 10:34:07.349531648 +0200
+++
new/yast2-metapackage-handler-4.0.0/package/yast2-metapackage-handler.changes
2018-02-13 13:08:50.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Feb 13 11:46:30 UTC 2018 - [email protected]
+
+- don't use inline html styles when including package metadata
+ (bsc#1080792)
+- 4.0.0
+
+-------------------------------------------------------------------
Mon Nov 3 14:45:57 UTC 2014 - [email protected]
- do not use repository name as alias, it must be unique, let
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-3.1.4/package/yast2-metapackage-handler.spec
new/yast2-metapackage-handler-4.0.0/package/yast2-metapackage-handler.spec
--- old/yast2-metapackage-handler-3.1.4/package/yast2-metapackage-handler.spec
2015-05-15 10:34:07.349531648 +0200
+++ new/yast2-metapackage-handler-4.0.0/package/yast2-metapackage-handler.spec
2018-02-13 13:08:50.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-metapackage-handler
-Version: 3.1.4
+Version: 4.0.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-3.1.4/src/modules/OneClickInstallWidgets.rb
new/yast2-metapackage-handler-4.0.0/src/modules/OneClickInstallWidgets.rb
--- old/yast2-metapackage-handler-3.1.4/src/modules/OneClickInstallWidgets.rb
2015-05-15 10:34:07.353531648 +0200
+++ new/yast2-metapackage-handler-4.0.0/src/modules/OneClickInstallWidgets.rb
2018-02-13 13:08:50.000000000 +0100
@@ -118,7 +118,7 @@
Ops.add(
Ops.add(
Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Heading(_("Repository Description:"))
),
NewLinesToRichText(description)
@@ -177,7 +177,7 @@
Ops.add(
Ops.add(
Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Heading(_("Package Description:"))
),
NewLinesToRichText(description)
@@ -229,7 +229,7 @@
Ops.add(
Ops.add(
Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Heading(_("Package Description:"))
),
NewLinesToRichText(description)
@@ -355,7 +355,7 @@
end
summaryStr = Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Colorize(
_(
"If you continue, the following changes will be made to your
system:"
@@ -454,7 +454,7 @@
:Value,
Ops.add(
Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Para(NewLinesToRichText(description))
),
"</body>"
@@ -481,7 +481,7 @@
failedPatterns = deep_copy(failedPatterns)
failedPackages = deep_copy(failedPackages)
statusStr = Ops.add(
- "<body bgcolor=\"White\">",
+ "<body>",
HTML.Heading(_("Software installation"))
)
