Hello community,
here is the log from the commit of package yast2-squid for openSUSE:Factory checked in at 2019-07-31 14:21:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-squid (Old)
and /work/SRC/openSUSE:Factory/.yast2-squid.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid"
Wed Jul 31 14:21:34 2019 rev:51 rq:711071 version:4.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-squid/yast2-squid.changes 2018-12-31 09:43:34.778354673 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-squid.new.4126/yast2-squid.changes 2019-07-31 14:21:37.422531149 +0200
@@ -1,0 +2,15 @@
+Thu Jun 20 11:19:29 UTC 2019 - Knut Anderssen
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip log firewall absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:14 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-squid-4.1.4.tar.bz2
New:
----
yast2-squid-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.rocesU/_old 2019-07-31 14:21:37.802530607 +0200
+++ /var/tmp/diff_new_pack.rocesU/_new 2019-07-31 14:21:37.806530601 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-squid
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,21 +17,20 @@
Name: yast2-squid
-Version: 4.1.4
+Version: 4.2.1
Release: 0
+Summary: Configuration of squid
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-squid
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# Yast2::ServiceWidget
-Requires: yast2 >= 4.1.0
-
%if 0%{?suse_version} > 1325
BuildRequires: libboost_regex-devel
%else
BuildRequires: boost-devel
%endif
-
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
@@ -39,46 +38,38 @@
# Yast2::ServiceWidget
BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
-#BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: Configuration of squid
-License: GPL-2.0-only
-Group: System/YaST
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
%description
Configuration of squid
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_squid.la
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/squid
%config /etc/sysconfig/SuSEfirewall2.d/services/squid
-%{yast_yncludedir}/squid/*
-%{yast_clientdir}/squid.rb
-%{yast_clientdir}/squid_*.rb
-%{yast_moduledir}/Squid.*
-%{yast_moduledir}/SquidACL.*
-%{yast_moduledir}/SquidErrorMessages.*
-%{yast_desktopdir}/squid.desktop
-%{yast_schemadir}/autoyast/rnc/squid.rnc
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-%{yast_plugindir}/libpy2ag_squid.so*
-%{yast_scrconfdir}/*.scr
+%{yast_plugindir}
+%{yast_scrconfdir}
%doc %{yast_docdir}
%license COPYING
++++++ yast2-squid-4.1.4.tar.bz2 -> yast2-squid-4.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/Dockerfile new/yast2-squid-4.2.1/Dockerfile
--- old/yast2-squid-4.1.4/Dockerfile 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/Dockerfile 2019-06-20 13:30:11.000000000 +0200
@@ -1,4 +1,4 @@
-FROM yastdevel/ruby
+FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest
RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
libboost_regex-devel \
gcc-c++ \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/package/yast2-squid.changes new/yast2-squid-4.2.1/package/yast2-squid.changes
--- old/yast2-squid-4.1.4/package/yast2-squid.changes 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/package/yast2-squid.changes 2019-06-20 13:30:11.000000000 +0200
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Jun 20 11:19:29 UTC 2019 - Knut Anderssen
+
+- Fixed failing old testsuite: do not depend on the environment,
+ skip log firewall absence in Mode.test() (bsc#1138668)
+- 4.2.1
+
+-------------------------------------------------------------------
+Fri May 31 12:40:14 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
+-------------------------------------------------------------------
Wed Dec 12 12:24:20 UTC 2018 - Josef Reidinger
- Fix name of exception (related to fix for bsc#1118291)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/package/yast2-squid.spec new/yast2-squid-4.2.1/package/yast2-squid.spec
--- old/yast2-squid-4.1.4/package/yast2-squid.spec 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/package/yast2-squid.spec 2019-06-20 13:30:11.000000000 +0200
@@ -12,26 +12,25 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-squid
-Version: 4.1.4
+Version: 4.2.1
Release: 0
+Summary: Configuration of squid
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-squid
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-# Yast2::ServiceWidget
-Requires: yast2 >= 4.1.0
-
%if 0%{?suse_version} > 1325
BuildRequires: libboost_regex-devel
%else
BuildRequires: boost-devel
%endif
-
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: perl-XML-Writer
@@ -39,46 +38,38 @@
# Yast2::ServiceWidget
BuildRequires: yast2 >= 4.1.0
BuildRequires: yast2-core-devel
-BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: yast2-devtools >= 4.2.2
BuildRequires: yast2-testsuite
-#BuildArchitectures: noarch
-
Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: Configuration of squid
-License: GPL-2.0-only
-Group: System/YaST
+# Yast2::ServiceWidget
+Requires: yast2 >= 4.1.0
%description
Configuration of squid
%prep
-%setup -n %{name}-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
-
rm -rf %{buildroot}/%{yast_plugindir}/libpy2ag_squid.la
+%yast_metainfo
%files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/squid
%config /etc/sysconfig/SuSEfirewall2.d/services/squid
-%{yast_yncludedir}/squid/*
-%{yast_clientdir}/squid.rb
-%{yast_clientdir}/squid_*.rb
-%{yast_moduledir}/Squid.*
-%{yast_moduledir}/SquidACL.*
-%{yast_moduledir}/SquidErrorMessages.*
-%{yast_desktopdir}/squid.desktop
-%{yast_schemadir}/autoyast/rnc/squid.rnc
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
%{yast_icondir}
-%{yast_plugindir}/libpy2ag_squid.so*
-%{yast_scrconfdir}/*.scr
+%{yast_plugindir}
+%{yast_scrconfdir}
%doc %{yast_docdir}
%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/Makefile.am new/yast2-squid-4.2.1/src/Makefile.am
--- old/yast2-squid-4.1.4/src/Makefile.am 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/Makefile.am 2019-06-20 13:30:11.000000000 +0200
@@ -30,7 +30,7 @@
autoyast-rnc/squid.rnc
desktop_DATA = \
- desktop/squid.desktop
+ desktop/org.opensuse.yast.Squid.desktop
scalabledir = @icondir@/hicolor/scalable/apps
scalable_DATA = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/desktop/org.opensuse.yast.Squid.desktop new/yast2-squid-4.2.1/src/desktop/org.opensuse.yast.Squid.desktop
--- old/yast2-squid-4.1.4/src/desktop/org.opensuse.yast.Squid.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-squid-4.2.1/src/desktop/org.opensuse.yast.Squid.desktop 2019-06-20 13:30:11.000000000 +0200
@@ -0,0 +1,25 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=squid
+
+X-SuSE-YaST-Group=Net_advanced
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=all
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=squid
+X-SuSE-YaST-AutoInstSchema=squid.rnc
+X-SuSE-YaST-Keywords=proxy,network,internet
+
+Icon=yast-squid
+Exec=xdg-su -c "/sbin/yast2 squid"
+
+Name=YaST Squid
+GenericName=Squid
+Comment=Configure a Squid cache proxy server
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/desktop/squid.desktop new/yast2-squid-4.2.1/src/desktop/squid.desktop
--- old/yast2-squid-4.1.4/src/desktop/squid.desktop 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/desktop/squid.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=squid
-
-X-SuSE-YaST-Group=Net_advanced
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=squid
-X-SuSE-YaST-AutoInstSchema=squid.rnc
-X-SuSE-YaST-Keywords=proxy,network,internet
-
-Icon=yast-squid
-Exec=xdg-su -c "/sbin/yast2 squid"
-
-Name=Squid
-GenericName=Configure a Squid cache proxy server
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/include/squid/wizards.rb new/yast2-squid-4.2.1/src/include/squid/wizards.rb
--- old/yast2-squid-4.1.4/src/include/squid/wizards.rb 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/include/squid/wizards.rb 2019-06-20 13:30:11.000000000 +0200
@@ -69,7 +69,7 @@
}
Wizard.CreateDialog
- Wizard.SetDesktopTitleAndIcon("squid")
+ Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.Squid")
ret = Sequencer.Run(aliases, sequence)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-4.1.4/src/modules/Squid.rb new/yast2-squid-4.2.1/src/modules/Squid.rb
--- old/yast2-squid-4.1.4/src/modules/Squid.rb 2018-12-12 13:31:03.000000000 +0100
+++ new/yast2-squid-4.2.1/src/modules/Squid.rb 2019-06-20 13:30:11.000000000 +0200
@@ -1099,7 +1099,7 @@
Progress.NextStage
Progress.set(false)
- if !firewalld.read
+ if !firewalld.read && !Mode.test
# bnc#808722: yast2 squid fail if SuSEfirewall in not installed
# other or no firewall can be installed
Builtins.y2warning("Cannot read firewall settings.")