Hello community,
here is the log from the commit of package yast2-squid for openSUSE:Factory
checked in at 2017-10-17 01:52:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old)
and /work/SRC/openSUSE:Factory/.yast2-squid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid"
Tue Oct 17 01:52:02 2017 rev:45 rq:533937 version:4.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2016-06-07
23:50:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-squid.new/yast2-squid.changes
2017-10-17 01:52:03.795712646 +0200
@@ -1,0 +2,7 @@
+Fri Oct 13 10:35:05 UTC 2017 - lsle...@suse.cz
+
+- Replace the generic "boost-devel" build dependency with more
+ specific "libboost_regex-devel" (bsc#1062805)
+- 4.0.0
+
+-------------------------------------------------------------------
Old:
----
yast2-squid-3.1.5.tar.bz2
New:
----
yast2-squid-4.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.pDpPvJ/_old 2017-10-17 01:52:04.619674048 +0200
+++ /var/tmp/diff_new_pack.pDpPvJ/_new 2017-10-17 01:52:04.627673674 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-squid
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,14 +17,20 @@
Name: yast2-squid
-Version: 3.1.5
+Version: 4.0.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Requires: yast2 >= 2.21.22
+
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_regex-devel
+%else
BuildRequires: boost-devel
+%endif
+
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
++++++ yast2-squid-3.1.5.tar.bz2 -> yast2-squid-4.0.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-squid-3.1.5/.travis.yml
new/yast2-squid-4.0.0/.travis.yml
--- old/yast2-squid-3.1.5/.travis.yml 2016-06-07 14:07:04.470214132 +0200
+++ new/yast2-squid-4.0.0/.travis.yml 2017-02-01 10:38:22.081942258 +0100
@@ -1,16 +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/SLE-12-GA/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2
yast2-core-dev libboost-dev libboost-regex-dev" -g "rspec:3.3.0 yast-rake
gettext"
+ - docker build -t yast-squid-image .
script:
- - rake check:syntax
- - rake check:pot
- - 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-squid-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-squid-3.1.5/CONTRIBUTING.md
new/yast2-squid-4.0.0/CONTRIBUTING.md
--- old/yast2-squid-3.1.5/CONTRIBUTING.md 2016-06-07 14:07:04.474214132
+0200
+++ new/yast2-squid-4.0.0/CONTRIBUTING.md 2016-09-19 10:21:36.664479318
+0200
@@ -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-squid-3.1.5/Dockerfile
new/yast2-squid-4.0.0/Dockerfile
--- old/yast2-squid-3.1.5/Dockerfile 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-squid-4.0.0/Dockerfile 2017-02-01 10:38:22.081942258 +0100
@@ -0,0 +1,8 @@
+FROM yastdevel/ruby
+RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
+ boost-devel \
+ gcc-c++ \
+ libtool \
+ yast2-core-devel
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-squid-3.1.5/package/yast2-squid.changes
new/yast2-squid-4.0.0/package/yast2-squid.changes
--- old/yast2-squid-3.1.5/package/yast2-squid.changes 2016-06-07
14:07:04.526214132 +0200
+++ new/yast2-squid-4.0.0/package/yast2-squid.changes 2017-10-13
15:01:31.206995386 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Oct 13 10:35:05 UTC 2017 - lsle...@suse.cz
+
+- Replace the generic "boost-devel" build dependency with more
+ specific "libboost_regex-devel" (bsc#1062805)
+- 4.0.0
+
+-------------------------------------------------------------------
Tue Jun 7 11:18:02 UTC 2016 - igonzalezs...@suse.com
- Stop generating autodocs (fate#320356)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-squid-3.1.5/package/yast2-squid.spec
new/yast2-squid-4.0.0/package/yast2-squid.spec
--- old/yast2-squid-3.1.5/package/yast2-squid.spec 2016-06-07
14:07:04.526214132 +0200
+++ new/yast2-squid-4.0.0/package/yast2-squid.spec 2017-10-13
15:01:31.206995386 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-squid
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,14 +17,20 @@
Name: yast2-squid
-Version: 3.1.5
+Version: 4.0.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Requires: yast2 >= 2.21.22
+
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_regex-devel
+%else
BuildRequires: boost-devel
+%endif
+
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
