openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2021
- 1 participants
- 2434 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jupyter-imatlab for openSUSE:Factory checked in at 2021-03-30 20:59:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jupyter-imatlab (Old)
and /work/SRC/openSUSE:Factory/.jupyter-imatlab.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jupyter-imatlab"
Tue Mar 30 20:59:05 2021 rev:5 rq:869694 version:0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/jupyter-imatlab/jupyter-imatlab.changes 2020-01-03 17:37:41.019317203 +0100
+++ /work/SRC/openSUSE:Factory/.jupyter-imatlab.new.2401/jupyter-imatlab.changes 2021-03-30 20:59:07.500633875 +0200
@@ -1,0 +2,7 @@
+Wed Feb 3 23:26:54 UTC 2021 - Ben Greiner <code(a)bnavigator.de>
+
+- Fix wheel install path for new python-rpm-macros
+- pyproject_install already recompiles, no need for second time
+- Support testing (if you have MATLAB)
+
+-------------------------------------------------------------------
New:
----
test_imatlab.py
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jupyter-imatlab.spec ++++++
--- /var/tmp/diff_new_pack.hLxtMq/_old 2021-03-30 20:59:09.316635870 +0200
+++ /var/tmp/diff_new_pack.hLxtMq/_new 2021-03-30 20:59:09.320635874 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jupyter-imatlab
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,8 @@
%define pythons python3
-%bcond_without test
+# We can only test if the commercial MATLAB Engine API for Python is installed
+%bcond_with test
Name: jupyter-imatlab
Version: 0.4
Release: 0
@@ -26,6 +27,7 @@
Group: Development/Languages/Python
URL: https://github.com/imatlab/imatlab
Source0: https://files.pythonhosted.org/packages/py3/i/imatlab/imatlab-%{version}-py…
+Source1: https://raw.githubusercontent.com/imatlab/imatlab/master/test_imatlab.py
BuildRequires: fdupes
BuildRequires: jupyter-ipykernel >= 4.1
BuildRequires: jupyter-ipython >= 6
@@ -34,6 +36,10 @@
BuildRequires: python3-pip
BuildRequires: python3-plotly
BuildRequires: unzip
+%if %{with test}
+BuildRequires: python3-curses
+BuildRequires: python3-jupyter-kernel-test
+%endif
Requires: jupyter-ipykernel >= 4.1
Requires: jupyter-ipython >= 6
Requires: jupyter-widgetsnbextension >= 1.0
@@ -53,6 +59,7 @@
%prep
%setup -q -T -c
+cp %{SOURCE1} .
%build
# Make mock MATLAB engine to allow kernel installation.
@@ -61,16 +68,21 @@
echo 'EngineError = MatlabExecutionError = Exception' > matlab/engine.py
%install
-cp -a %{SOURCE0} .
+%{python_expand mkdir build; cp -a %{SOURCE0} build/}
%pyproject_install
-# avoid time-based .pyc files for reproducibility:
-%py3_compile %{buildroot}%{python3_sitelib}
-
PYTHONPATH=%{buildroot}%{python3_sitelib} python3 -m imatlab install --prefix %{buildroot}%{_prefix}
+cp %{buildroot}%{python3_sitelib}/imatlab-%{version}.dist-info/LICENSE.txt .
+%fdupes %{buildroot}%{python3_sitelib}
+
+%check
+%if %{with test}
+export JUPYTER_PATH=%{buildroot}%{_jupyter_prefix}
+%pyunittest -v test_imatlab.py
+%endif
%files
+%license LICENSE.txt
%{python3_sitelib}/imatlab-%{version}.dist-info
-%license %{python3_sitelib}/imatlab-%{version}.dist-info/LICENSE.txt
%{python3_sitelib}/imatlab/
%{_jupyter_kernel_dir}/imatlab/
++++++ test_imatlab.py ++++++
# import re
import jupyter_kernel_test as jkt
class IMatlabTests(jkt.KernelTests):
kernel_name = "imatlab"
language_name = "matlab"
file_extension = ".m"
code_hello_world = "fprintf('hello, world') % some comment"
code_stderr = "fprintf(2, 'oops')"
completion_samples = [
{"text": "matlabroo", "matches": ["matlabroot"]},
# Not including prefix (only `cursor_start:cursor_end`).
{"text": "ls setup.", "matches": ["setup.cfg", "setup.py"]},
]
complete_code_samples = [
"1+1",
"for i=1:3\ni\nend",
# FIXME The following should be considered "invalid", but really all
# that matters is that they are not "incomplete".
"function test_complete",
"function test_complete, end",
"classdef test_complete, end",
]
incomplete_code_samples = [
"for i=1:3",
# FIXME We'd rather consider this as "invalid".
"classdef test_complete",
]
invalid_code_samples = [
"for end",
]
code_display_data = [
{"code": "set(0, 'defaultfigurevisible', 'off'); "
"imatlab_export_fig('print-png'); "
"plot([1, 2]);",
"mime": "image/png"},
]
code_inspect_sample = "help"
# FIXME We actually never send "data" back -- only print it.
# code_generate_error = "[1, 2] + [3, 4, 5];"
# code_execute_result = [
# {"code": "1+1;", "result": ""},
# ]
# FIXME History operations are not tested as (as mentioned in the docs)
# they are unnecessary (re-implemented by the frontends, overly complex).
# supported_history_operations = ["tail", "range", "search"]
# code_history_pattern = [
# re.escape("1+1"),
# ]
# FIXME Not available.
# code_page_something = None
# code_clear_output = None
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package jupyter-matlab-kernel for openSUSE:Factory checked in at 2021-03-30 20:58:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jupyter-matlab-kernel (Old)
and /work/SRC/openSUSE:Factory/.jupyter-matlab-kernel.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jupyter-matlab-kernel"
Tue Mar 30 20:58:52 2021 rev:4 rq:869692 version:0.16.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/jupyter-matlab-kernel/jupyter-matlab-kernel.changes 2019-11-14 23:59:57.588381755 +0100
+++ /work/SRC/openSUSE:Factory/.jupyter-matlab-kernel.new.2401/jupyter-matlab-kernel.changes 2021-03-30 20:58:55.736620950 +0200
@@ -1,0 +2,11 @@
+Wed Feb 3 23:36:49 UTC 2021 - Ben Greiner <code(a)bnavigator.de>
+
+- Update to 0.16.11
+ (No upstream changelog, but from the commit history:)
+ * Fix autocompletion
+ * Fix MATLAB R2020b support
+ * Fix async compatibility for MATLAB R2017a
+ * Figure order fix
+- BuildRequires jupyter-jupyter_core-filesystem for the macro
+
+-------------------------------------------------------------------
@@ -6 +16,0 @@
-
Old:
----
matlab_kernel-0.16.7.tar.gz
New:
----
matlab_kernel-0.16.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jupyter-matlab-kernel.spec ++++++
--- /var/tmp/diff_new_pack.0ohEFa/_old 2021-03-30 20:58:56.944622278 +0200
+++ /var/tmp/diff_new_pack.0ohEFa/_new 2021-03-30 20:58:56.948622282 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jupyter-matlab-kernel
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%bcond_without test
Name: jupyter-matlab-kernel
-Version: 0.16.7
+Version: 0.16.11
Release: 0
Summary: Matlab kernel for Jupyter
License: BSD-3-Clause AND MIT
@@ -27,6 +27,7 @@
Source: https://files.pythonhosted.org/packages/source/m/matlab-kernel/matlab_kerne…
BuildRequires: fdupes
BuildRequires: jupyter-jupyter_client >= 4.4.0
+BuildRequires: jupyter-jupyter_core-filesystem
BuildRequires: python-rpm-macros
BuildRequires: python3-certifi
BuildRequires: python3-setuptools
++++++ matlab_kernel-0.16.7.tar.gz -> matlab_kernel-0.16.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/PKG-INFO new/matlab_kernel-0.16.11/PKG-INFO
--- old/matlab_kernel-0.16.7/PKG-INFO 2019-06-12 11:51:08.000000000 +0200
+++ new/matlab_kernel-0.16.11/PKG-INFO 2020-11-09 21:41:42.153092000 +0100
@@ -1,116 +1,127 @@
-Metadata-Version: 2.1
-Name: matlab_kernel
-Version: 0.16.7
-Summary: UNKNOWN
-Home-page: https://github.com/Calysto/matlab_kernel
-Author: Steven Silvester, Antony Lee
-License: BSD
-Description:
- A Matlab kernel for Jupyter
- ===========================
-
- Prerequisites
- -------------
- Install `Jupyter Notebook <http://jupyter.readthedocs.org/en/latest/install.html>`_ and the
- `Matlab engine for Python <https://www.mathworks.com/help/matlab/matlab-engine-for-python.html>`_.
-
- Installation
- ------------
-
- Install using::
-
- $ pip install matlab_kernel
-
- or ``pip install git+https://github.com/Calysto/matlab_kernel`` for the dev version.
-
- To use the kernel, run one of::
-
- $ jupyter notebook
- # In the notebook interface, select Matlab from the 'New' menu
- $ jupyter qtconsole --kernel matlab
- $ jupyter console --kernel matlab
-
- To remove from kernel listings::
-
- $ jupyter kernelspec remove matlab
-
-
- Configuration
- -------------
- The kernel can be configured by adding an ``matlab_kernel_config.py`` file to the
- ``jupyter`` config path. The ``MatlabKernel`` class offers ``plot_settings`` as a configurable traits.
- The available plot settings are:
- 'format', 'backend', 'width', 'height', and 'resolution'.
-
- .. code:: bash
-
- cat ~/.jupyter/matlab_kernel_config.py
- c.MatlabKernel.plot_settings = dict(format='svg')
-
-
- Troubleshooting
- ---------------
-
- Kernel Times Out While Starting
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- If the kernel is not starting, try running the following from a terminal.
-
- .. code
- python -m matlab_kernel.check
-
- Please include that output if opening an issue.
-
-
- Kernel is Not Listed
- ~~~~~~~~~~~~~~~~~~~~
- If the kernel is not listed as an available kernel, first try the following command:
-
- .. code:: shell
-
- python -m matlab_kernel install --user
-
- If the kernel is still not listed, verify that the following point to the same
- version of python:
-
- .. code:: shell
-
- which python # use "where" if using cmd.exe
- which jupyter
-
-
- Additional information
- ----------------------
-
- The Matlab kernel is based on `MetaKernel <http://pypi.python.org/pypi/metakernel>`_,
- which means it features a standard set of magics. For a full list of magics,
- run ``%lsmagic`` in a cell.
-
- A sample notebook is available online_.
-
- A note about plotting. After each call to Matlab, we ask Matlab to save any
- open figures to image files whose format and resolution are defined using the
- ``%plot`` magic. The resulting image is shown inline in the notebook. You can
- use ``%plot native`` to raise normal Matlab windows instead.
-
-
- Advanced Installation Notes
- ---------------------------
-
- We automatically install a Jupyter kernelspec when installing the python package. This location can be found using ``jupyter kernelspec list``. If the default location is not desired, you can remove the directory for the octave kernel, and install using ``python -m matlab_kernel install``. See ``python -m matlab_kernel install --help`` for available options.
-
- It has been reported that Matlab version 2016b works fine. However, Matlab 2014b does not work with Python 3.5.
-
- .. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab…
-
-
-
-Platform: UNKNOWN
-Classifier: Framework :: IPython
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Topic :: System :: Shells
-Requires: metakernel (>0.23.0)
-Requires: jupyter_client (>=4.4.0)
-Requires: ipython (>=4.0.0)
-Description-Content-Type: text/x-rst
+Metadata-Version: 2.1
+Name: matlab_kernel
+Version: 0.16.11
+Summary: UNKNOWN
+Home-page: https://github.com/Calysto/matlab_kernel
+Author: Steven Silvester, Antony Lee
+License: BSD
+Description:
+ A Matlab kernel for Jupyter
+ ===========================
+
+ Prerequisites
+ -------------
+ Install `Jupyter Notebook <http://jupyter.readthedocs.org/en/latest/install.html>`_ and the
+ `Matlab engine for Python <https://www.mathworks.com/help/matlab/matlab-engine-for-python.html>`_.
+
+ Installation
+ ------------
+
+ Install using::
+
+ $ pip install matlab_kernel
+
+ or ``pip install git+https://github.com/Calysto/matlab_kernel`` for the dev version.
+
+ To use the kernel, run one of::
+
+ $ jupyter notebook
+ # In the notebook interface, select Matlab from the 'New' menu
+ $ jupyter qtconsole --kernel matlab
+ $ jupyter console --kernel matlab
+
+ To remove from kernel listings::
+
+ $ jupyter kernelspec remove matlab
+
+
+ Configuration
+ -------------
+ The kernel can be configured by adding an ``matlab_kernel_config.py`` file to the
+ ``jupyter`` config path. The ``MatlabKernel`` class offers ``plot_settings`` as a configurable traits.
+ The available plot settings are:
+ 'format', 'backend', 'width', 'height', and 'resolution'.
+
+ .. code:: bash
+
+ cat ~/.jupyter/matlab_kernel_config.py
+ c.MatlabKernel.plot_settings = dict(format='svg')
+
+
+ Troubleshooting
+ ---------------
+
+ Kernel Times Out While Starting
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ If the kernel is not starting, try running the following from a terminal.
+
+ .. code:: shell
+
+ python -m matlab_kernel.check
+
+ Please include that output if opening an issue.
+
+
+ Kernel is Not Listed
+ ~~~~~~~~~~~~~~~~~~~~
+ If the kernel is not listed as an available kernel, first try the following command:
+
+ .. code:: shell
+
+ python -m matlab_kernel install --user
+
+ If the kernel is still not listed, verify that the following point to the same
+ version of python:
+
+ .. code:: shell
+
+ which python # use "where" if using cmd.exe
+ which jupyter
+
+
+ Additional information
+ ----------------------
+
+ The Matlab kernel is based on `MetaKernel <http://pypi.python.org/pypi/metakernel>`_,
+ which means it features a standard set of magics. For a full list of magics,
+ run ``%lsmagic`` in a cell.
+
+ A sample notebook is available online_.
+
+ A note about plotting. After each call to Matlab, we ask Matlab to save any
+ open figures to image files whose format and resolution are defined using the
+ ``%plot`` magic. The resulting image is shown inline in the notebook. You can
+ use ``%plot native`` to raise normal Matlab windows instead.
+
+
+ Advanced Installation Notes
+ ---------------------------
+
+ We automatically install a Jupyter kernelspec when installing the python package. This location can be found using ``jupyter kernelspec list``. If the default location is not desired, you can remove the directory for the octave kernel, and install using ``python -m matlab_kernel install``. See ``python -m matlab_kernel install --help`` for available options.
+
+ It has been reported that Matlab version 2016b works fine. However, Matlab 2014b does not work with Python 3.5.
+
+ .. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab…
+
+
+ Development
+ ~~~~~~~~~~~
+
+ Install the package locally::
+
+ $ pip install -e .
+ $ python -m matlab_kernel install
+
+ As you make changes, test them in a notebook (restart the kernel between changes).
+
+
+Platform: UNKNOWN
+Classifier: Framework :: IPython
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Topic :: System :: Shells
+Requires: metakernel (>0.23.0)
+Requires: jupyter_client (>=4.4.0)
+Requires: ipython (>=4.0.0)
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/README.rst new/matlab_kernel-0.16.11/README.rst
--- old/matlab_kernel-0.16.7/README.rst 2019-06-12 11:50:38.000000000 +0200
+++ new/matlab_kernel-0.16.11/README.rst 2020-11-02 19:57:07.000000000 +0100
@@ -48,7 +48,8 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If the kernel is not starting, try running the following from a terminal.
-.. code
+.. code:: shell
+
python -m matlab_kernel.check
Please include that output if opening an issue.
@@ -96,3 +97,13 @@
.. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab…
+Development
+~~~~~~~~~~~
+
+Install the package locally::
+
+ $ pip install -e .
+ $ python -m matlab_kernel install
+
+As you make changes, test them in a notebook (restart the kernel between changes).
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/matlab_kernel/__init__.py new/matlab_kernel-0.16.11/matlab_kernel/__init__.py
--- old/matlab_kernel-0.16.7/matlab_kernel/__init__.py 2019-06-12 11:51:02.000000000 +0200
+++ new/matlab_kernel-0.16.11/matlab_kernel/__init__.py 2020-11-09 21:41:38.000000000 +0100
@@ -1,3 +1,3 @@
"""A Matlab kernel for Jupyter"""
-__version__ = '0.16.7'
+__version__ = '0.16.11'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/matlab_kernel/check.py new/matlab_kernel-0.16.11/matlab_kernel/check.py
--- old/matlab_kernel-0.16.7/matlab_kernel/check.py 2019-06-12 11:50:38.000000000 +0200
+++ new/matlab_kernel-0.16.11/matlab_kernel/check.py 2020-11-02 19:57:07.000000000 +0100
@@ -14,5 +14,6 @@
m = MatlabKernel()
print('Matlab connection established')
print(m.banner)
+ print(m.do_execute_direct('disp("hi from Matlab!")'))
except Exception as e:
print(e)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/matlab_kernel/kernel.py new/matlab_kernel-0.16.11/matlab_kernel/kernel.py
--- old/matlab_kernel-0.16.7/matlab_kernel/kernel.py 2019-06-12 11:50:38.000000000 +0200
+++ new/matlab_kernel-0.16.11/matlab_kernel/kernel.py 2020-11-09 21:41:27.000000000 +0100
@@ -3,6 +3,8 @@
from matlab.engine import MatlabExecutionError
except ImportError:
matlab = None
+ class MatlabExecutionError(Exception):
+ pass
from functools import partial
try:
from StringIO import StringIO
@@ -81,6 +83,14 @@
self.__matlab = matlab.engine.start_matlab()
except matlab.engine.EngineError:
self.__matlab = matlab.engine.connect_matlab()
+ # detecting the correct kwargs for async running
+ # matlab 'async' param is deprecated since it became a keyword in python 3.7
+ # instead, 'background' param is available and recommended since Matlab R2017b
+ self._async_kwargs = {'nargout': 0, 'async': True}
+ try:
+ self._matlab.eval('version', **self._async_kwargs)
+ except SyntaxError:
+ self._async_kwargs = {'nargout': 0, 'background': True}
self._validated_plot_settings = {
"backend": "inline",
"size": (560, 420),
@@ -106,8 +116,8 @@
try:
self._matlab.eval(
"arrayfun("
- "@(h, i) print(h, sprintf('{}/%i', i), '-d{}', '-r{}'),"
- "get(0, 'children'), (1:{})')".format(
+ "@(h, i) print(h, sprintf('{}/%06i', i), '-d{}', '-r{}'),"
+ "get(0, 'children'), ({}:-1:1)')".format(
'/'.join(tmpdir.split(os.sep)),
settings["format"],
settings["resolution"],
@@ -164,10 +174,11 @@
# For structs, we need to return `structname.fieldname` instead of just
# `fieldname`, which `mtFindAllTabCompletions` does.
+ # For tables also.
if "." in name:
prefix, _ = name.rsplit(".", 1)
- if self._matlab.eval("isstruct({})".format(prefix)):
+ if self._matlab.eval("isstruct({})".format(prefix)) | self._matlab.eval("istable({})".format(prefix)):
compls = ["{}.{}".format(prefix, compl) for compl in compls]
return compls
@@ -251,8 +262,7 @@
try:
with pipes(stdout=_PseudoStream(partial(self.Print, end="")),
stderr=_PseudoStream(partial(self.Error, end=""))):
- kwargs = { 'nargout': 0, 'async': True }
- future = self._matlab.eval(code, **kwargs)
+ future = self._matlab.eval(code, **self._async_kwargs)
future.result()
except (SyntaxError, MatlabExecutionError, KeyboardInterrupt) as exc:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/matlab_kernel.egg-info/PKG-INFO new/matlab_kernel-0.16.11/matlab_kernel.egg-info/PKG-INFO
--- old/matlab_kernel-0.16.7/matlab_kernel.egg-info/PKG-INFO 2019-06-12 11:51:07.000000000 +0200
+++ new/matlab_kernel-0.16.11/matlab_kernel.egg-info/PKG-INFO 2020-11-09 21:41:42.000000000 +0100
@@ -1,116 +1,127 @@
-Metadata-Version: 2.1
-Name: matlab-kernel
-Version: 0.16.7
-Summary: UNKNOWN
-Home-page: https://github.com/Calysto/matlab_kernel
-Author: Steven Silvester, Antony Lee
-License: BSD
-Description:
- A Matlab kernel for Jupyter
- ===========================
-
- Prerequisites
- -------------
- Install `Jupyter Notebook <http://jupyter.readthedocs.org/en/latest/install.html>`_ and the
- `Matlab engine for Python <https://www.mathworks.com/help/matlab/matlab-engine-for-python.html>`_.
-
- Installation
- ------------
-
- Install using::
-
- $ pip install matlab_kernel
-
- or ``pip install git+https://github.com/Calysto/matlab_kernel`` for the dev version.
-
- To use the kernel, run one of::
-
- $ jupyter notebook
- # In the notebook interface, select Matlab from the 'New' menu
- $ jupyter qtconsole --kernel matlab
- $ jupyter console --kernel matlab
-
- To remove from kernel listings::
-
- $ jupyter kernelspec remove matlab
-
-
- Configuration
- -------------
- The kernel can be configured by adding an ``matlab_kernel_config.py`` file to the
- ``jupyter`` config path. The ``MatlabKernel`` class offers ``plot_settings`` as a configurable traits.
- The available plot settings are:
- 'format', 'backend', 'width', 'height', and 'resolution'.
-
- .. code:: bash
-
- cat ~/.jupyter/matlab_kernel_config.py
- c.MatlabKernel.plot_settings = dict(format='svg')
-
-
- Troubleshooting
- ---------------
-
- Kernel Times Out While Starting
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- If the kernel is not starting, try running the following from a terminal.
-
- .. code
- python -m matlab_kernel.check
-
- Please include that output if opening an issue.
-
-
- Kernel is Not Listed
- ~~~~~~~~~~~~~~~~~~~~
- If the kernel is not listed as an available kernel, first try the following command:
-
- .. code:: shell
-
- python -m matlab_kernel install --user
-
- If the kernel is still not listed, verify that the following point to the same
- version of python:
-
- .. code:: shell
-
- which python # use "where" if using cmd.exe
- which jupyter
-
-
- Additional information
- ----------------------
-
- The Matlab kernel is based on `MetaKernel <http://pypi.python.org/pypi/metakernel>`_,
- which means it features a standard set of magics. For a full list of magics,
- run ``%lsmagic`` in a cell.
-
- A sample notebook is available online_.
-
- A note about plotting. After each call to Matlab, we ask Matlab to save any
- open figures to image files whose format and resolution are defined using the
- ``%plot`` magic. The resulting image is shown inline in the notebook. You can
- use ``%plot native`` to raise normal Matlab windows instead.
-
-
- Advanced Installation Notes
- ---------------------------
-
- We automatically install a Jupyter kernelspec when installing the python package. This location can be found using ``jupyter kernelspec list``. If the default location is not desired, you can remove the directory for the octave kernel, and install using ``python -m matlab_kernel install``. See ``python -m matlab_kernel install --help`` for available options.
-
- It has been reported that Matlab version 2016b works fine. However, Matlab 2014b does not work with Python 3.5.
-
- .. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab…
-
-
-
-Platform: UNKNOWN
-Classifier: Framework :: IPython
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Topic :: System :: Shells
-Requires: metakernel (>0.23.0)
-Requires: jupyter_client (>=4.4.0)
-Requires: ipython (>=4.0.0)
-Description-Content-Type: text/x-rst
+Metadata-Version: 2.1
+Name: matlab-kernel
+Version: 0.16.11
+Summary: UNKNOWN
+Home-page: https://github.com/Calysto/matlab_kernel
+Author: Steven Silvester, Antony Lee
+License: BSD
+Description:
+ A Matlab kernel for Jupyter
+ ===========================
+
+ Prerequisites
+ -------------
+ Install `Jupyter Notebook <http://jupyter.readthedocs.org/en/latest/install.html>`_ and the
+ `Matlab engine for Python <https://www.mathworks.com/help/matlab/matlab-engine-for-python.html>`_.
+
+ Installation
+ ------------
+
+ Install using::
+
+ $ pip install matlab_kernel
+
+ or ``pip install git+https://github.com/Calysto/matlab_kernel`` for the dev version.
+
+ To use the kernel, run one of::
+
+ $ jupyter notebook
+ # In the notebook interface, select Matlab from the 'New' menu
+ $ jupyter qtconsole --kernel matlab
+ $ jupyter console --kernel matlab
+
+ To remove from kernel listings::
+
+ $ jupyter kernelspec remove matlab
+
+
+ Configuration
+ -------------
+ The kernel can be configured by adding an ``matlab_kernel_config.py`` file to the
+ ``jupyter`` config path. The ``MatlabKernel`` class offers ``plot_settings`` as a configurable traits.
+ The available plot settings are:
+ 'format', 'backend', 'width', 'height', and 'resolution'.
+
+ .. code:: bash
+
+ cat ~/.jupyter/matlab_kernel_config.py
+ c.MatlabKernel.plot_settings = dict(format='svg')
+
+
+ Troubleshooting
+ ---------------
+
+ Kernel Times Out While Starting
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ If the kernel is not starting, try running the following from a terminal.
+
+ .. code:: shell
+
+ python -m matlab_kernel.check
+
+ Please include that output if opening an issue.
+
+
+ Kernel is Not Listed
+ ~~~~~~~~~~~~~~~~~~~~
+ If the kernel is not listed as an available kernel, first try the following command:
+
+ .. code:: shell
+
+ python -m matlab_kernel install --user
+
+ If the kernel is still not listed, verify that the following point to the same
+ version of python:
+
+ .. code:: shell
+
+ which python # use "where" if using cmd.exe
+ which jupyter
+
+
+ Additional information
+ ----------------------
+
+ The Matlab kernel is based on `MetaKernel <http://pypi.python.org/pypi/metakernel>`_,
+ which means it features a standard set of magics. For a full list of magics,
+ run ``%lsmagic`` in a cell.
+
+ A sample notebook is available online_.
+
+ A note about plotting. After each call to Matlab, we ask Matlab to save any
+ open figures to image files whose format and resolution are defined using the
+ ``%plot`` magic. The resulting image is shown inline in the notebook. You can
+ use ``%plot native`` to raise normal Matlab windows instead.
+
+
+ Advanced Installation Notes
+ ---------------------------
+
+ We automatically install a Jupyter kernelspec when installing the python package. This location can be found using ``jupyter kernelspec list``. If the default location is not desired, you can remove the directory for the octave kernel, and install using ``python -m matlab_kernel install``. See ``python -m matlab_kernel install --help`` for available options.
+
+ It has been reported that Matlab version 2016b works fine. However, Matlab 2014b does not work with Python 3.5.
+
+ .. _online: http://nbviewer.ipython.org/github/Calysto/matlab_kernel/blob/master/matlab…
+
+
+ Development
+ ~~~~~~~~~~~
+
+ Install the package locally::
+
+ $ pip install -e .
+ $ python -m matlab_kernel install
+
+ As you make changes, test them in a notebook (restart the kernel between changes).
+
+
+Platform: UNKNOWN
+Classifier: Framework :: IPython
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Topic :: System :: Shells
+Requires: metakernel (>0.23.0)
+Requires: jupyter_client (>=4.4.0)
+Requires: ipython (>=4.0.0)
+Description-Content-Type: text/x-rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/matlab_kernel-0.16.7/setup.cfg new/matlab_kernel-0.16.11/setup.cfg
--- old/matlab_kernel-0.16.7/setup.cfg 2019-06-12 11:51:08.000000000 +0200
+++ new/matlab_kernel-0.16.11/setup.cfg 2020-11-09 21:41:42.153558300 +0100
@@ -1,15 +1,15 @@
-[metadata]
-license_file = LICENSE.txt
-
-[versioneer]
-vcs = git
-style = pep440
-versionfile_source = matlab_kernel/_version.py
-versionfile_build = matlab_kernel/_version.py
-tag_prefix = v
-parentdir_prefix = matlab_kernel-
-
-[egg_info]
-tag_build =
-tag_date = 0
-
+[metadata]
+license_file = LICENSE.txt
+
+[versioneer]
+vcs = git
+style = pep440
+versionfile_source = matlab_kernel/_version.py
+versionfile_build = matlab_kernel/_version.py
+tag_prefix = v
+parentdir_prefix = matlab_kernel-
+
+[egg_info]
+tag_build =
+tag_date = 0
+
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package molsketch for openSUSE:Factory checked in at 2021-03-30 20:58:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/molsketch (Old)
and /work/SRC/openSUSE:Factory/.molsketch.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "molsketch"
Tue Mar 30 20:58:39 2021 rev:5 rq:869496 version:0.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/molsketch/molsketch.changes 2020-07-03 00:03:28.722291805 +0200
+++ /work/SRC/openSUSE:Factory/.molsketch.new.2401/molsketch.changes 2021-03-30 20:58:53.180618142 +0200
@@ -1,0 +2,19 @@
+Sat Jan 23 19:47:39 UTC 2021 - Matthias Mail��nder <mailaender(a)opensuse.org>
+
+- Put essential libraries in the main package
+
+-------------------------------------------------------------------
+Sat Jan 2 14:26:13 UTC 2021 - Matthias Mail��nder <mailaender(a)opensuse.org>
+
+- Update to version 0.7.0
+ * New localizations: Greek, German, and Chinese
+ * Direction of attached hydrogen atoms can be set explicitly by user
+ * Atom shape can also be a circle instead of a rectangle
+ * Bitmap export with adjustable resolution
+ * Support OpenBabel 3
+ * Fixes for sum formula and molecule tooltip
+ * Fix clipping of bonds
+ * Fixed OpenBabel support
+- Add fix-compilation.patch
+
+-------------------------------------------------------------------
@@ -121 +140,2 @@
-- initial packaging, added QtAssistant include path to CMakeLists.txt, added BuildRequires: -post-build-checks because of compiler warnings
+- initial packaging, added QtAssistant include path to CMakeLists.txt
+- added BuildRequires: -post-build-checks because of compiler warnings
Old:
----
Molsketch-0.6.0-src.tar.gz
New:
----
Molsketch-0.7.0-src.tar.gz
fix-compilation.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ molsketch.spec ++++++
--- /var/tmp/diff_new_pack.rUJhbl/_old 2021-03-30 20:58:54.048619096 +0200
+++ /var/tmp/diff_new_pack.rUJhbl/_new 2021-03-30 20:58:54.052619100 +0200
@@ -1,7 +1,7 @@
#
# spec file for package molsketch
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,15 @@
%define soname -qt5-%{sover}
%define binname %{name}-qt5
Name: molsketch
-Version: 0.6.0
+Version: 0.7.0
Release: 0
Summary: 2D molecular structures editor
License: GPL-2.0-or-later
Group: Productivity/Scientific/Chemistry
URL: https://molsketch.sourceforge.net
Source0: https://downloads.sourceforge.net/molsketch/Molsketch-%{version}-src.tar.gz
+# PATCH-FIX-UPSTREAM https://sourceforge.net/p/molsketch/bugs/40/
+Patch0: fix-compilation.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -79,7 +81,7 @@
Help documentation for %{name}.
%prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -p1
dos2unix -k -c ascii doc/cs/%{name}.adp
%build
@@ -91,6 +93,10 @@
%install
%cmake_install
+# Fix program not finding its shared libraries.
+mv %{buildroot}%{_libdir}/%{name}/libmolsketch-qt5.so %{buildroot}%{_libdir}/libmolsketch-qt5.so
+mv %{buildroot}%{_libdir}/%{name}/libobabeliface-qt5.so %{buildroot}%{_libdir}/libobabeliface-qt5.so
+
for sz in 24 32 48 64 128 256 512
do
rsvg-convert -o %{name}-${sz}.png -w ${sz} molsketch/images/molsketch.svg
@@ -106,6 +112,7 @@
%license COPYING
%doc CHANGELOG
%{_bindir}/%{binname}
+%{_libdir}/*.so
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/molsketch.*
%{_datadir}/pixmaps/molsketch.xpm
@@ -115,7 +122,6 @@
%{_datadir}/mime/packages/molsketch.xml
%files devel
-%{_libdir}/%{name}/
%{_includedir}/lib%{name}/
%files doc
++++++ Molsketch-0.6.0-src.tar.gz -> Molsketch-0.7.0-src.tar.gz ++++++
++++ 20032 lines of diff (skipped)
++++++ fix-compilation.patch ++++++
From 42949476e07960deaaa4907a2af87742d5c6eec0 Mon Sep 17 00:00:00 2001
Message-Id: <42949476e07960deaaa4907a2af87742d5c6eec0.1609602170.git.matthias(a)mailaender.name>
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias(a)mailaender.name>
Date: Sat, 2 Jan 2021 16:42:43 +0100
Subject: [PATCH] Fix compilation.
---
libmolsketch/atom.cpp | 12 ++++++------
libmolsketch/bond.cpp | 4 ++--
libmolsketch/librarymodel.cpp | 2 +-
libmolsketch/molecule.cpp | 10 +++++-----
molsketch/mainwindow.cpp | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libmolsketch/atom.cpp b/libmolsketch/atom.cpp
index bdfba59..270faae 100644
--- a/libmolsketch/atom.cpp
+++ b/libmolsketch/atom.cpp
@@ -985,19 +985,19 @@ namespace Molsketch {
QPointF intersection;
QLineF topEdge{bounds.topLeft(), bounds.topRight()};
- if (topEdge.intersects(line, &intersection) == QLineF::BoundedIntersection)
+ if (topEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, topEdge);
QLineF bottomEdge{bounds.bottomLeft(), bounds.bottomRight()};
- if (bottomEdge.intersects(line, &intersection) == QLineF::BoundedIntersection)
+ if (bottomEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, bottomEdge);
QLineF leftEdge{bounds.topLeft(), bounds.bottomLeft()};
- if (leftEdge.intersects(line, &intersection) == QLineF::BoundedIntersection)
+ if (leftEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, leftEdge);
QLineF rightEdge{bounds.topRight(), bounds.bottomRight()};
- if (rightEdge.intersects(line, &intersection) == QLineF::BoundedIntersection)
+ if (rightEdge.intersect(line, &intersection) == QLineF::BoundedIntersection)
return IntersectionData(intersection, rightEdge);
// TODO pick the edge it intersects with first (i.e. closest to the middle)
return IntersectionData(QPointF(), QLineF());
@@ -1034,7 +1034,7 @@ namespace Molsketch {
qreal Atom::getExtentForIntersectionOfOuterLineAndEdge(const IntersectionData &edgeIntersection, const QLineF &outer) const {
QPointF intersectionOfOuterAndEdge;
- QLineF::IntersectType intersectType = edgeIntersection.getEdge().intersects(outer, &intersectionOfOuterAndEdge);
+ QLineF::IntersectType intersectType = edgeIntersection.getEdge().intersect(outer, &intersectionOfOuterAndEdge);
return QLineF::BoundedIntersection == intersectType
? QLineF(intersectionOfOuterAndEdge, outer.p1()).length() / outer.length()
: 0;
@@ -1098,7 +1098,7 @@ namespace Molsketch {
{
QLineF edge(corners[i], corners[i+1]);
QPointF result;
- if (connection.intersects(edge, &result) == QLineF::BoundedIntersection)
+ if (connection.intersect(edge, &result) == QLineF::BoundedIntersection)
return result;
}
return connection.p1();
diff --git a/libmolsketch/bond.cpp b/libmolsketch/bond.cpp
index 0a8f951..6dadd33 100644
--- a/libmolsketch/bond.cpp
+++ b/libmolsketch/bond.cpp
@@ -231,10 +231,10 @@ namespace Molsketch {
if (m_bondType != DoubleLegacy) return;
m_bondType = DoubleSymmetric;
auto beginBondList = m_beginAtom->bonds();
- auto beginBonds = QSet<Bond*>(beginBondList.begin(), beginBondList.end());
+ auto beginBonds = QSet<Bond*>::fromList(beginBondList);
beginBonds -= this;
auto endBondList = m_endAtom->bonds();
- auto endBonds = QSet<Bond*>(endBondList.begin(), endBondList.end());
+ auto endBonds = QSet<Bond*>::fromList(endBondList);
endBonds -= this;
// no other bonds: symmetric
if (beginBonds.empty() && endBonds.empty()) return;
diff --git a/libmolsketch/librarymodel.cpp b/libmolsketch/librarymodel.cpp
index 0da451a..ccb54c6 100644
--- a/libmolsketch/librarymodel.cpp
+++ b/libmolsketch/librarymodel.cpp
@@ -40,7 +40,7 @@ namespace Molsketch {
int fetchCount;
void cleanMolecules() {
qInfo("Clearing list of molecules. Count: %d", items.size());
- auto itemSet = QSet<MoleculeModelItem*>(items.begin(), items.end());
+ auto itemSet = QSet<MoleculeModelItem*>::fromList(items);
for (auto molecule : itemSet) delete molecule;
items.clear();
fetchCount = 0;
diff --git a/libmolsketch/molecule.cpp b/libmolsketch/molecule.cpp
index f18fd8d..3caa42a 100644
--- a/libmolsketch/molecule.cpp
+++ b/libmolsketch/molecule.cpp
@@ -127,7 +127,7 @@ namespace Molsketch {
{
setDefaults();
auto atoms = mol.atoms();
- auto atomSet = QSet<Atom*>(atoms.begin(), atoms.end());
+ auto atomSet = QSet<Atom*>::fromList(atoms);
clone(atomSet);
setPos(mol.pos());
updateElectronSystems();
@@ -304,7 +304,7 @@ namespace Molsketch {
QList<Molecule*> molList;
auto atomList = atoms();
- auto atomSet = QSet<Atom*>(atomList.begin(), atomList.end());
+ auto atomSet = QSet<Atom*>::fromList(atomList);
while (!atomSet.empty())
{
QSet<Atom*> subgroup = getConnectedAtoms(*(atomSet.begin()));
@@ -396,7 +396,7 @@ namespace Molsketch {
{
if (atoms().isEmpty()) return false;
auto atomList = atoms();
- auto atomSet = QSet<Atom*>(atomList.begin(), atomList.end());
+ auto atomSet = QSet<Atom*>::fromList(atomList);
return getConnectedAtoms(atoms().first()) != atomSet;
}
@@ -595,9 +595,9 @@ void Molecule::paintElectronSystems(QPainter *painter) const {
bool canMerge(const ElectronSystem *es1, const ElectronSystem *es2)
{
auto firstListOfAtoms = es1->atoms();
- auto firstSetOfAtoms = QSet<Atom*>(firstListOfAtoms.begin(), firstListOfAtoms.end());
+ auto firstSetOfAtoms = QSet<Atom*>::fromList(firstListOfAtoms);
auto secondListOfAtoms = es2->atoms();
- auto secondSetOfAtoms = QSet<Atom*>(secondListOfAtoms.begin(), secondListOfAtoms.end()); // TODO utility function
+ auto secondSetOfAtoms = QSet<Atom*>::fromList(secondListOfAtoms); // TODO utility function
// may not share an atom
if (!(firstSetOfAtoms & secondSetOfAtoms).empty()) return false;
diff --git a/molsketch/mainwindow.cpp b/molsketch/mainwindow.cpp
index 0cc54ea..8751c2e 100644
--- a/molsketch/mainwindow.cpp
+++ b/molsketch/mainwindow.cpp
@@ -399,7 +399,7 @@ void MainWindow::openAssistant()
stream << QLatin1String("setSource ")
<< file.absoluteFilePath()
<< QLatin1Char('\0')
- << Qt::endl;
+ << ('\n');
#endif
}
@@ -567,7 +567,7 @@ void MainWindow::initializeAssistant()
stream << QLatin1String("register ")
<< file.absoluteFilePath()
<< QLatin1Char('\0')
- << Qt::endl;
+ << ('\n');
#endif
}
--
2.26.2
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package VFlib3 for openSUSE:Factory checked in at 2021-03-30 20:58:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/VFlib3 (Old)
and /work/SRC/openSUSE:Factory/.VFlib3.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "VFlib3"
Tue Mar 30 20:58:13 2021 rev:24 rq:869228 version:3.7.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/VFlib3/VFlib3.changes 2017-08-10 14:12:03.932771246 +0200
+++ /work/SRC/openSUSE:Factory/.VFlib3.new.2401/VFlib3.changes 2021-03-30 20:58:17.176578587 +0200
@@ -1,0 +2,14 @@
+Thu Feb 4 13:46:14 CET 2021 - tiwai(a)suse.de
+
+- Update to version 3.7.2:
+ * Relased under dual-license (GPL v3 and FreeType).
+- Dropped obsoleted patches:
+ VFlib3-compare-always-false.patch
+ VFlib3-freetype2.patch
+ VFlib3-gnu_source-declaration.patch
+ VFlib3-include.patch
+ VFlib3-info-dir.patch
+- Fix the build with the recent gcc due to the duplicated symbols:
+ VFlib3-add-external.patch
+
+-------------------------------------------------------------------
Old:
----
VFlib3-3.6.14.tar.bz2
VFlib3-compare-always-false.patch
VFlib3-freetype2.patch
VFlib3-gnu_source-declaration.patch
VFlib3-include.patch
VFlib3-info-dir.patch
New:
----
VFlib3-3.7.2.tar.gz
VFlib3-add-external.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ VFlib3.spec ++++++
--- /var/tmp/diff_new_pack.qHD9HU/_old 2021-03-30 20:58:17.800579273 +0200
+++ /var/tmp/diff_new_pack.qHD9HU/_new 2021-03-30 20:58:17.800579273 +0200
@@ -1,7 +1,7 @@
#
# spec file for package VFlib3
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,22 @@
# 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/
#
-%define libname libVFlib3-5
+%define libname libVFlib3-10
Name: VFlib3
-Version: 3.6.14
+Version: 3.7.2
Release: 0
Summary: Versatile Font Library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Summary(ja): "Versatile" ���������������������������
-Url: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/
-Source0: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/VFlib3-%{vers…
+URL: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/VFlib/
+Source0: http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/VFlib3-%{vers…
+Patch1: VFlib3-add-external.patch
Source1: vflibcap-tex
-Patch0: VFlib3-compare-always-false.patch
-Patch1: VFlib3-freetype2.patch
-Patch2: VFlib3-gnu_source-declaration.patch
-Patch3: VFlib3-include.patch
-Patch4: VFlib3-info-dir.patch
-BuildRequires: autoconf213
BuildRequires: fdupes
BuildRequires: imake
BuildRequires: libtool
@@ -93,19 +88,12 @@
%prep
%setup -q
-%autopatch -p1
-
-# libtool files must be having proper content
-rm -f config.{cache,sub,guess}
-ln -s %{_datadir}/libtool/build-aux/config.guess ./
-ln -s %{_datadir}/libtool/build-aux/config.sub ./
+%patch1 -p1
%build
-autoconf-2.13
%configure \
--with-kpathsea \
- --with-freetype2 \
- --with-freetype2-includedir=%{_includedir}/freetype2 \
+ --with-opentype \
--with-texmf-root=%{_datadir}/texmf \
--with-gettext
make %{?_smp_mflags}
@@ -124,6 +112,7 @@
# remove duped docs
rm -rf %{buildroot}%{_datadir}/VFlib/%{version}/doc/
find %{buildroot} -type f -name "*.la" -delete -print
+find %{buildroot} -type f -name "*.a" -delete -print
%fdupes %{buildroot}
@@ -137,7 +126,8 @@
%postun -n %{libname} -p /sbin/ldconfig
%files
-%doc ANNOUNCE* CHANGES COPYING* DISTRIB*
+%doc ANNOUNCE* CHANGES DISTRIB*
+%license LICENSE-FTL.TXT LICENSE-GPLV3.TXT
%{_infodir}/VFlib*info*
%dir %{_datadir}/VFlib
%dir %{_datadir}/VFlib/%{version}
++++++ VFlib3-add-external.patch ++++++
---
src/texfonts.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/src/texfonts.h
+++ b/src/texfonts.h
@@ -72,9 +72,9 @@
#endif
-Glocal int vf_dbg_drv_texfonts;
-Glocal SEXP_ALIST vf_tex_default_properties;
-Glocal SEXP_ALIST vf_tex_default_variables;
+extern Glocal int vf_dbg_drv_texfonts;
+extern Glocal SEXP_ALIST vf_tex_default_properties;
+extern Glocal SEXP_ALIST vf_tex_default_variables;
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package netdata for openSUSE:Factory checked in at 2021-03-30 20:58:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netdata (Old)
and /work/SRC/openSUSE:Factory/.netdata.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netdata"
Tue Mar 30 20:58:00 2021 rev:27 rq:880415 version:1.29.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/netdata/netdata.changes 2020-12-31 10:02:34.351093552 +0100
+++ /work/SRC/openSUSE:Factory/.netdata.new.2401/netdata.changes 2021-03-30 20:58:09.216569843 +0200
@@ -1,0 +2,151 @@
+Tue Feb 23 23:47:17 UTC 2021 - Mia Herkt <mia(a)0x0.st>
+
+- Update to 1.29.3
+Release v1.29.3 is a patch release to improve the stability of the
+Netdata Agent.
+
+We discovered a bug that when proc.plugin attempts to collect the
+operstate parameter for a virtual network interface. If the chart
+is obsoleted, the Netdata Agent crashes.
+
+This release also contains additional bug fixes and improvements.
+
+Bug fixes
+ * Fix proc.plugin to invalidate RRDSETVAR pointers on obsoletion.
+
+-------------------------------------------------------------------
+Thu Feb 18 16:15:44 UTC 2021 - Mia Herkt <mia(a)0x0.st>
+
+- Update to 1.29.2
+Release v1.29.2 is a patch release to improve the stability of the
+Netdata Agent.
+
+We discovered that an improvement introduced in v1.29.0 could
+inadvertently set all os_* host labels to unknown, which could
+affect users who leverage these host labels to organize their
+nodes, deploy health entities, or export metrics to external
+time-series databases. This bug has been fixed.
+
+This release also contains additional bug fixes and improvements.
+
+Improvements
+ * Make the Opsgenie API URL configurable.
+ * Add k8s_cluster_id host label.
+ * Enable apps.plugin aggregation debug messages.
+ * Add configuration parameter to disable stock alarms.
+ * Add ACLK proxy setting as host label.
+ * Add freeswitch to apps_groups.conf.
+ * Simplify thread creation and remove unnecessary variables in
+ the eBPF plugin.
+
+Bug fixes
+ * Fix the context filtering on the data query endpoint.
+ * Fix container/host detection in the system-info.sh script.
+ * Add a small delay to the ipv4_tcp_resets alarms.
+ * Fix collecting operstate for virtual network interfaces.
+ * Fix sendmail unrecognized option F error.
+ * Fix so that raw binary data should never be printed.
+ * Change KSM memory chart type to stacked.
+ * Allow the REMOVED alarm status via ACLK if the previous status
+ was WARN/CRIT.
+ * Reduce excessive logging in the ACLK.
+
+- Changes in 1.29.1
+Release v1.29.1 is a hotfix release to address a crash in the
+Netdata Agent.
+
+A locking bug in one of the internal collectors in Netdata could
+cause it to crash during shutdown in a way that would result in the
+Netdata Agent taking an excessively long time to exit.
+
+Bug fixes
+ * Fix crash during shutdown of cgroups internal plugin.
+
+-------------------------------------------------------------------
+Wed Feb 3 14:12:09 UTC 2021 - Mia Herkt <mia(a)0x0.st>
+
+- Update to 1.29.0 (go.d.plugin 0.27.0)
+The v1.29.0 release of the Netdata Agent is a maintenance release
+that brings incremental but necessary improvements that make your
+monitoring experience more robust. We've pushed improvements and
+bug fixes to the installation and update scripts, enriched our
+library of collectors, and focused on fixing bugs reported by the
+community.
+
+
+At a glance
+
+Netdata now collects and meaningfully organizes metrics from both
+the Couchbase JSON document database and the nginx-module-vts
+module for exposing metrics about NGINX virtual hosts.
+
+We've also migrated more collectors from Python to Go in our
+continued efforts to make data collection faster and more robust.
+The newest effort includes our Redis, Pika, and Energi Core Wallet
+collectors.
+
+On the dashboard, we improved the responsiveness of panning forward
+and backward through historical metrics data by preventing
+unnecessary updates and reducing the number of calls. The charts
+should also now immediately update when you stop panning.
+
+
+Improvements
+ * Reduce the number of alarm updates on ACLK.
+ * Remove unused entries from structures.
+ * Improve the retry/backoff during claiming.
+ * Support multiple chart label keys in data queries.
+ * Truncate excessive information from titles for apps and
+ cgroups collectors.
+ * Use mguid instead of hostname in the ACLK collector list.
+ * Cleanup and minor fixes to eBPF collector.
+ * Add _is_k8s_node label to the host labels.
+ * Move ACLK into a legacy subfolder.
+ * Exclude autofs by default in the diskspace plugin.
+ * Mark internal functions as static in health code.
+ * Remove unused struct in health code.
+ * Add support for per series styling for dygraphs.
+
+Dashboard
+ * Fix minor vulnerability alert by updating socket-io dependency.
+ * Fix dygraph panning responsiveness, chart heights and
+ performance improvements.
+ * Make legend position configurable.
+
+Collectors
+ * Add Go version of the redis collector.
+ * Add Go version of the pika collector.
+ * Add Go version of the energis collector.
+ * Add a new nginxvts collector.
+ * Add a new couchbase collector.
+ * Add Traefik v2 to the prometheus collector default
+ configuration.
+ * Add an expected_prefix configuration option to the prometheus
+ collector.
+ * Add patterns support to the filecheck collector.
+
+Bug fixes
+ * Fix container detection from systemd-detect-virt.
+ * Fix handling of TLS config so that cURL works in all cases.
+ * Fix disconnect message sent via ACLK on agent shutdown
+ * Fix prometheus remote write header
+ * Fix values in Prometheus export for metrics, collected by the
+ Prometheus collector
+ * Fix handling spaces in labels values in the Prometheus
+ collector
+ * Fix mysql.slave_status alarm for go mysql collector
+ * Make mdstat_mismatch_cnt alarm less strict
+ * Dispatch cgroup discovery into another thread
+ * Fix data source option for Prometheus web API in exporting
+ configuration
+ * Fix anomalies collector custom model bug
+ * Fix broken dbengine stress tests.
+ * Fix segmentation fault in the agent
+ * Fix memory allocation when computing standard deviation
+ * Fix temperature parsing in the hddtemp collector
+ * Fix postgres password bug and change default config
+ * Add handling "yes" and "no" and flexible space match in the
+ python.d/fail2ban plugin
+ * Fix spelling mistakes in the Python plugin and documentation.
+
+-------------------------------------------------------------------
@@ -1353 +1504 @@
- the response).
+ the response). boo#1139094
@@ -1356 +1507 @@
- the response).
+ the response). boo#1139095
@@ -1358,0 +1510 @@
+ boo#1139098
Old:
----
go.d.plugin-v0.26.2.tar.gz
netdata-v1.28.0.tar.gz
New:
----
go.d.plugin-v0.27.0.tar.gz
netdata-v1.29.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netdata.spec ++++++
--- /var/tmp/diff_new_pack.AE7ilq/_old 2021-03-30 20:58:10.616571380 +0200
+++ /var/tmp/diff_new_pack.AE7ilq/_new 2021-03-30 20:58:10.620571386 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netdata
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
%define netdata_user netdata
%define netdata_group netdata
-%define godplugin_version 0.26.2
+%define godplugin_version 0.27.0
Name: netdata
-Version: 1.28.0
+Version: 1.29.3
Release: 0
Summary: A system for distributed real-time performance and health monitoring
# netdata is GPL-3.0+, other licenses refer to included third-party software (see REDISTRIBUTED.md)
++++++ _service ++++++
--- /var/tmp/diff_new_pack.AE7ilq/_old 2021-03-30 20:58:10.656571424 +0200
+++ /var/tmp/diff_new_pack.AE7ilq/_new 2021-03-30 20:58:10.656571424 +0200
@@ -1,6 +1,6 @@
<services>
<service name="download_files" mode="disabled" />
<service name="go_modules" mode="disabled">
- <param name="archive">go.d.plugin-v0.26.2.tar.gz</param>
+ <param name="archive">go.d.plugin-v0.27.0.tar.gz</param>
</service>
</services>
++++++ go.d.plugin-v0.26.2.tar.gz -> go.d.plugin-v0.27.0.tar.gz ++++++
++++ 15152 lines of diff (skipped)
++++++ netdata-v1.28.0.tar.gz -> netdata-v1.29.3.tar.gz ++++++
/work/SRC/openSUSE:Factory/netdata/netdata-v1.28.0.tar.gz /work/SRC/openSUSE:Factory/.netdata.new.2401/netdata-v1.29.3.tar.gz differ: char 14, line 1
++++++ vendor.tar.gz ++++++
++++ 154666 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package msitools for openSUSE:Factory checked in at 2021-03-30 20:57:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/msitools (Old)
and /work/SRC/openSUSE:Factory/.msitools.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msitools"
Tue Mar 30 20:57:52 2021 rev:7 rq:868841 version:0.101
Changes:
--------
--- /work/SRC/openSUSE:Factory/msitools/msitools.changes 2020-02-21 16:41:38.729947628 +0100
+++ /work/SRC/openSUSE:Factory/.msitools.new.2401/msitools.changes 2021-03-30 20:57:55.340554599 +0200
@@ -1,0 +2,14 @@
+Tue Feb 2 23:25:47 UTC 2021 - Martin Hauke <mardnh(a)gmx.de>
+
+- Update to version 101:
+ * convert the build system to Meson
+ * remove uuid dependency
+ * wixl: Make the ServiceControl attributes Remove/Start/Stop
+ optional.
+ * wixl: Implement SET_PROPERTY custom action
+ * wixl: Properly handle empty GUID in Component nodes
+ * wixl: Support ASYNC for CustomAction.Return
+ * msiinfo: fix buffer overflow
+ * translation updates, various misc fixes
+
+-------------------------------------------------------------------
Old:
----
msitools-0.100.tar.xz
New:
----
msitools-0.101.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ msitools.spec ++++++
--- /var/tmp/diff_new_pack.w1klY8/_old 2021-03-30 20:57:55.968555289 +0200
+++ /var/tmp/diff_new_pack.w1klY8/_new 2021-03-30 20:57:55.972555293 +0200
@@ -1,7 +1,7 @@
#
# spec file for package msitools
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# 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: msitools
-Version: 0.100
+Version: 0.101
Release: 0
Summary: Tools to inspect and build Windows Installer (.MSI) files
License: GPL-2.0-or-later
@@ -25,6 +25,7 @@
Source: https://download.gnome.org/sources/msitools/%{version}/%{name}-%{version}.t…
BuildRequires: bison
BuildRequires: intltool
+BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gio-2.0) >= 2.14
BuildRequires: pkgconfig(gobject-2.0)
@@ -32,7 +33,6 @@
BuildRequires: pkgconfig(libgcab-1.0) >= 0.1.10
BuildRequires: pkgconfig(libgsf-1)
BuildRequires: pkgconfig(libxml-2.0) >= 2.7
-BuildRequires: pkgconfig(uuid) >= 1.41.3
BuildRequires: pkgconfig(vapigen) >= 0.16
%description
@@ -81,21 +81,19 @@
%autosetup
%build
-%configure \
- --disable-static
-%make_build
+%meson
+%meson_build
%install
-%make_install
+%meson_install
%find_lang %{name} %{?no_lang_C}
-find %{buildroot} -type f -name "*.la" -delete -print
%post -n libmsi0 -p /sbin/ldconfig
%postun -n libmsi0 -p /sbin/ldconfig
%files
-%license COPYING COPYING.LIB
-%doc AUTHORS NEWS
+%license copyright
+%doc AUTHORS NEWS README.md
%{_bindir}/msibuild
%{_bindir}/msidiff
%{_bindir}/msidump
++++++ msitools-0.100.tar.xz -> msitools-0.101.tar.xz ++++++
++++ 120793 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nunit3 for openSUSE:Factory checked in at 2021-03-30 20:57:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nunit3 (Old)
and /work/SRC/openSUSE:Factory/.nunit3.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nunit3"
Tue Mar 30 20:57:41 2021 rev:1 rq:868757 version:3.7.1
Changes:
--------
New Changes file:
--- /dev/null 2021-03-11 01:47:46.020784395 +0100
+++ /work/SRC/openSUSE:Factory/.nunit3.new.2401/nunit3.changes 2021-03-30 20:57:46.444544825 +0200
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+Fri Jul 17 12:55:45 UTC 2020 - Matthias Mail��nder <mailaender(a)opensuse.org>
+
+- update to version 3.7.1
+
+-------------------------------------------------------------------
+Sat Sep 24 19:40:21 UTC 2016 - mailaender(a)opensuse.org
+
+- update to version 3.4.1
+
+-------------------------------------------------------------------
+Mon Dec 28 15:45:04 UTC 2015 - mailaender(a)opensuse.org
+
+- initial packaging
+
New:
----
3.7.1.tar.gz
nunit.pc
nunit3.changes
nunit3.spec
nunitlite-runner.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nunit3.spec ++++++
#
# spec file for package nunit3
#
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: nunit3
Version: 3.7.1
Release: 0
Summary: Unit-testing framework for all .NET languages
License: MIT
Group: Development/Languages/Other
URL: http://www.nunit.org/
Source0: https://github.com/nunit/nunit/archive/%{version}.tar.gz
Source1: nunit.pc
Source2: nunitlite-runner.sh
BuildRequires: mono-devel
BuildArch: noarch
%description
NUnit is a unit testing framework for all .NET languages. It serves the
same purpose as JUnit does in the Java world. It supports test
categories, testing for exceptions and writing test results in plain
text or XML.
%package devel
Summary: Development files for NUnit
Group: Development/Languages/Other
Requires: nunit3 = %{version}
%description devel
This package contains development files for NUnit integration.
%prep
%setup -q -n nunit-%{version}
# Remove prebuilt binaries
find . -name "*.dll" -print -delete
%build
xbuild /property:Configuration=Release src/NUnitFramework/framework/nunit.framework-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/nunitlite/nunitlite-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/nunitlite-runner/nunitlite-runner-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/mock-assembly/mock-assembly-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/slow-tests/slow-nunit-tests-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/testdata/nunit.testdata-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/tests/nunit.framework.tests-4.5.csproj
xbuild /property:Configuration=Release src/NUnitFramework/nunitlite.tests/nunitlite.tests-4.5.csproj
%install
mkdir -p %{buildroot}%{_datadir}/pkgconfig
install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/
mkdir -p %{buildroot}%{_bindir}
install -m0755 %{SOURCE2} %{buildroot}%{_bindir}/nunitlite-runner
mkdir -p %{buildroot}%{_prefix}/lib/mono/nunit3
install -m0644 src/NUnitFramework/nunitlite-runner/App.config %{buildroot}%{_prefix}/lib/mono/nunit3/nunitlite-runner.exe.config
find bin -name \*.dll -exec install \-m0755 "{}" "%{buildroot}%{_prefix}/lib/mono/nunit3/" \;
find bin -name \*.exe -exec install \-m0755 "{}" "%{buildroot}%{_prefix}/lib/mono/nunit3/" \;
%files
%license LICENSE.txt
%doc README.md CHANGES.md NOTICES.txt
%{_bindir}/nunitlite-runner
%{_prefix}/lib/mono/nunit3/
%files devel
%doc CONTRIBUTING.md
%{_datadir}/pkgconfig/nunit.pc
%changelog
++++++ nunit.pc ++++++
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
Name: NUnit
Description: Testing framework for CLI
Version: 3.6.0.0
Libs: -r:${libdir}/mono/nunit/nunit.framework.dll -r:${libdir}/mono/nunit/nunit.framework.tests.dll -r:${libdir}/mono/nunit/nunit.testdata.dll -r:${libdir}/mono/nunit/nunitlite.dll
++++++ nunitlite-runner.sh ++++++
#!/bin/sh
exec /usr/bin/mono /usr/lib/mono/nunit/nunitlite-runner.exe "$@"
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mapserver for openSUSE:Factory checked in at 2021-03-30 20:57:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mapserver (Old)
and /work/SRC/openSUSE:Factory/.mapserver.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mapserver"
Tue Mar 30 20:57:28 2021 rev:1 rq:868337 version:7.6.1
Changes:
--------
New Changes file:
--- /dev/null 2021-03-11 01:47:46.020784395 +0100
+++ /work/SRC/openSUSE:Factory/.mapserver.new.2401/mapserver.changes 2021-03-30 20:57:37.016534387 +0200
@@ -0,0 +1,557 @@
+-------------------------------------------------------------------
+Wed Jan 20 01:15:24 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Drop BuildRequires on binary library packages; this is wrong.
+- Drop excessive runtime package requirements.
+
+-------------------------------------------------------------------
+Wed Dec 23 20:07:24 UTC 2020 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Modernize and ready specfile for Factory
+
+-------------------------------------------------------------------
+Tue Sep 8 19:49:30 UTC 2020 - Boris Manojlovic <boris(a)steki.net>
+
+- add USE_PROJ to compile flags to enable reprojections (TILE support)
+
+-------------------------------------------------------------------
+Sat Sep 5 09:14:07 UTC 2020 - Boris Manojlovic <boris(a)steki.net>
+
+- updated to latest version 7.6.1
+- fix building on opensuse leap 15.X
+- added mapserver-7.6.1-fix_python_install_path.patch to fix
+ python install location defaulting to arch independent location
+- a lot of changes between versions please look at:
+ https://mapserver.org/development/changelog/changelog-7-6.html#changelog-7-6
+ and at this location:
+ https://github.com/mapserver/mapserver/blob/branch-7-6/HISTORY.TXT
+- security fixes from older versions: CVE-2020-10872 and CVE-2020-10873
+
+-------------------------------------------------------------------
+Fri May 17 09:05:04 UTC 2019 - Dirk Stoecker <opensuse(a)dstoecker.de>
+
+- update to version 7.4.0
+ * MS RFC 117: PHP 7 MapScript Support Through SWIG
+ * native support for PHP 7 through mapscript (461f827)
+ * Fix potential cross-site scripting (XSS) security issue with
+ [layers] tag
+ * enhanced support for Python 3 mapscript through SWIG
+ * Allow compiling with PROJ 6, but full PROJ 6 support will be
+ included in the future MapServer 8 release (#5766)
+- Drop 5461.patch and cmake-3.12.patch included upstream
+
+-------------------------------------------------------------------
+Thu Sep 13 09:28:34 UTC 2018 - Dirk Stoecker <opensuse(a)dstoecker.de>
+
+- update to final release
+- Fix build with newer cmake: cmake-3.12.patch
+
+-------------------------------------------------------------------
+Thu Jun 7 11:51:11 UTC 2018 - opensuse(a)dstoecker.de
+
+- update to 7.2.0-beta1 to support Leap 15.0
+ * Add 5461.patch to support PHP7
+ * support python3
+
+-------------------------------------------------------------------
+Fri Dec 15 08:37:40 UTC 2017 - opensuse(a)dstoecker.de
+
+- update to 7.0.7
+
+-------------------------------------------------------------------
+Wed Apr 5 15:59:16 UTC 2017 - opensuse(a)dstoecker.de
+
+- udate to Mapserver 7.0.4, drop all patches
+
+-------------------------------------------------------------------
+Tue Mar 8 07:02:53 UTC 2016 - ralf.habacker(a)freenet.de
+
+- Add xxxx-fix-python-mapscript-soversion-install-issue.patch to fix
+ broken installing of mapscript python module
+- Exclude ruby from build for sles11 because of missing ruby dependencies
+- Use ruby-common as build dependency instead of outdated ruby-macros
+
+-------------------------------------------------------------------
+Fri Feb 5 14:22:24 UTC 2016 - guillaume(a)opensuse.org
+
+- Fix build when 'php_mapscript.so' is only file installed and no
+ *.so.1 and *.so%{version} (Fix openSUSE 13.1 build)
+
+-------------------------------------------------------------------
+Fri Feb 5 14:10:02 UTC 2016 - guillaume(a)opensuse.org
+
+- Add giflib_5.1.0.patch to fix compilation with giflib 5.1.0+
+- Add swig_3.patch to fix compilation with swig 3
+
+-------------------------------------------------------------------
+Sat Aug 30 18:34:09 UTC 2014 - bruno(a)ioda-net.ch
+
+- packaging spec-cleaner
+- fixed compilation error with php 5.6.0
+ upstream patch 4912-php56-php-input.patch
+ supported also php 5.5x
+- fixed blending tif error
+ upstream patch 4875-incorrect-blending-tif.patch
+
+-------------------------------------------------------------------
+Sun Mar 30 18:52:41 UTC 2014 - bruno(a)ioda-net.ch
+
+- use correct ruby rpm macros
+
+-------------------------------------------------------------------
+Thu Jan 2 20:30:07 UTC 2014 - bruno(a)ioda-net.ch
+
+- updated to upstream 6.4.1
+ http://mapserver.org/development/changelog/changelog-6-4.html#changelog-6-4…
+ full list of changes in 6.4.1
+
+- spec cleaning
+- modified patches:
+ * 4788.patch (upstream issue 4788) SOVERSION in CMakefile
+ * 4788-php-mapscript patch for php versionning
+ * 4788-python-mapscript patch for python versionning
+- deleted patches: (merged upstream)
+ * 4791.patch fix lib path install
+ * 4803.patch fix for force_st2d
+
+-------------------------------------------------------------------
+Mon Nov 18 14:05:34 UTC 2013 - bruno(a)ioda-net.ch
+
+- Added Requires proj (missing espg for tools otherwise)
+- Added upstream #4803 patch forcest2d
+
+-------------------------------------------------------------------
+Thu Nov 14 15:27:13 UTC 2013 - bruno(a)ioda-net.ch
+
+- packaging : fix php mapscript name in mapscript.ini (symlink)
+- Added upstream #4788 patch versionning php-mapscript
+ Fix by removing buggy pre-post script
+- /srv/www/cgi-bin/ binaries as symlink to /usr/bin
+
+-------------------------------------------------------------------
+Sun Nov 3 15:28:44 UTC 2013 - tzotsos(a)opensuse.org
+
+- Some minor spec cleanup
+
+-------------------------------------------------------------------
+Sat Oct 26 16:28:36 UTC 2013 - bruno(a)ioda-net.ch
+
+- packaging fix tab
+- packaging fix php-mapscript
+ rename php_mapscript.so to php_mapscript-%{version}.so
+ (upstream bug in 6.4.0)
+ remove post check which remove php_mapscript.so
+
+-------------------------------------------------------------------
+Sun Oct 13 14:33:33 UTC 2013 - bruno(a)ioda-net.ch
+
+- Use patch commit 4791 for fixing cmake_install_lib
+- split libmapserver to its own package
+ could be used by mapscript module alone
+- add rpmlintrc with explanation for warning removal
+- Review licence part, description
+- Remove apache2-mod_php5 dependency which block usage on fcgid
+ fastcgi mode
+- Rename all mapscript package to fix naming policy and clarify
+ what they are
+- Added ruby mapscript package
+- Make all DWITH extension visible in the spec to be sure about
+ which one are activated or not
+
+-------------------------------------------------------------------
+Sun Apr 21 22:31:20 UTC 2013 - tzotsos(a)opensuse.org
+
+- Updated to v6.4.0 (see
+ http://mapserver.org/development/changelog/changelog-6-4.html#changelog-6-4…
+ for a detailed description of the changes).
+- Switched to CMake
+
+-------------------------------------------------------------------
+Sun Apr 21 22:31:20 UTC 2013 - tzotsos(a)opensuse.org
+
+- Updated to v6.2.1
+
+ * Move #4577 fixes out of libmapserver (2013-04-18 10:55:23 +0200 - Thomas Bonfort)
+ * Exposed labelObj.text and labelObj.expression in PHP/MapScript (closes #4310) (2013-04-16 13:41:18 +0000 - Alan Boudreault)
+ * Fixed problems found in the mapfile.xsd while trying to convert current mapfiles into xmlmapfiles (2013-01-30 09:45:41 -0700 - Alex Wells)
+ * Ensure that msCopyLabel copies expression and text directives (2013-02-20 09:02:56 +0000 - Homme Zwaagstra)
+ * Updated submodule for #4633 (2013-04-12 18:56:44 +0200 - Thomas Bonfort)
+ * Update submodule for backported fix of #4633 (2013-04-12 18:32:53 +0200 - Thomas Bonfort)
+ * OGR WFS output: do not force null integer values to 0 (#4633) (2013-04-12 00:57:27 +0200 - Even Rouault)
+ * Fix for WMS requests with width and height of 1 (#4629) (2013-04-11 19:30:25 +0200 - Thomas Bonfort)
+ * Parse key value pairs sent in POST body (#4627) (2013-04-04 12:49:37 +0200 - Martin Kofahl)
+ * Add a script to run full test suite (build + test run) (2013-04-11 10:22:00 +0200 - Thomas Bonfort)
+ * update autotest submodule for #4625 and #4624 (2013-04-09 13:17:05 +0200 - Thomas Bonfort)
+ * Use ows_schemas_location for sld_capabilities ref (#4624) (2013-04-08 20:38:40 -0400 - Tom Kralidis)
+ * Update msautotests for #4622 (2013-04-08 11:56:34 +0200 - Thomas Bonfort)
+ * Don���t entity-encode URLs used on attributes: libxml2 does this for us. Refs #4622 (2013-04-05 09:38:25 +0200 - ejn)
+ * Fix cgi label commands after multi-label changes (#4621) (2013-04-03 13:54:43 +0200 - Thomas Bonfort)
+ * Ignore additional encodings in received content-type headers (#4585) (2013-03-29 10:22:05 -0400 - Thomas Bonfort)
+ * Fix PHP building when GD is disabled. Closes #4550 (2013-03-28 16:53:07 -0400 - Thomas Bonfort)
+ * CAIRO renderer fails to render some truetype symbols (#4616) (2013-03-27 11:34:22 +0100 - szekerest)
+ * Fix mapfile writer to write SVG symbols (#4607) (2013-03-21 22:05:02 +0100 - szekerest)
+ * Fix issues with wms_layer_group printing (#4533) (2013-03-04 21:49:36 +0100 - szekerest)
+ * Write CLASS validation to mapfile (#4596) (2013-03-04 17:06:05 +0100 - Thomas Bonfort)
+ * Mark disabled layers as processed to prevent from being displayed in nested groups (#4533) (2013-03-03 19:25:25 +0100 - szekerest)
+ * Don���t write GRATICULE connectiontype (#4165) (2013-02-28 10:20:24 +0100 - Thomas Bonfort)
+ * Add validation block to copy functions (#4596) (2013-02-27 17:39:39 +0100 - Thomas Bonfort)
++++ 360 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.mapserver.new.2401/mapserver.changes
New:
----
mapserver-7.6.1-fix_python_install_path.patch
mapserver-7.6.1.tar.gz
mapserver-rpmlintrc
mapserver.changes
mapserver.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mapserver.spec ++++++
#
# spec file for package mapserver
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 Ioda-Net S��rl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot)
# Copyright (c) 2015 Angelos Tzotsos (kalxas)
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
%bcond_with python
%bcond_with ruby
#
# define python for future reference
%define _with_python 1
%define libname libmapserver2
%define _cgibindir /srv/www/cgi-bin
%if 0%{?suse_version} >= 1500
%define php_name php7
%else
%define php_name php5
%endif
Name: mapserver
Version: 7.6.1
Release: 0
Summary: Environment for building spatially-enabled internet applications
License: MIT
Group: Productivity/Networking/Web/Servers
Url: https://www.mapserver.org/
Source: https://download.osgeo.org/mapserver/%{name}-%{version}.tar.gz
Source9: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM mapserver-7.6.1-fix_python_install_path.patch fixing python installation path badly defaulting to arch independent location
Patch0: mapserver-7.6.1-fix_python_install_path.patch
BuildRequires: FastCGI-devel
BuildRequires: apache2-devel
BuildRequires: autoconf
BuildRequires: cairo-devel
BuildRequires: chrpath
BuildRequires: cmake >= 2.4
BuildRequires: freetype2-devel
BuildRequires: fribidi-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gd-devel >= 2.0.16
BuildRequires: giflib-devel
BuildRequires: harfbuzz-devel
BuildRequires: krb5-devel
BuildRequires: libcurl-devel
BuildRequires: libexpat-devel
BuildRequires: libgdal-devel >= 1.10
BuildRequires: libgeos-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libproj-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: mysql-devel
BuildRequires: openjpeg2-devel
BuildRequires: pam
BuildRequires: pam-devel
BuildRequires: postgresql-devel >= 9.1
%if 0%{?suse_version} >= 1500
BuildRequires: postgresql-server-devel >= 9.1
%endif
BuildRequires: proj
BuildRequires: libprotobuf-c-devel
BuildRequires: protobuf-c
BuildRequires: readline-devel
BuildRequires: rpm
BuildRequires: swig
BuildRequires: update-alternatives
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: zlib-devel
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: %{libname} = %{version}-%{release}
Requires: proj
%description
Mapserver is an internet mapping program that converts GIS data to
map images in real time. With appropriate interface pages,
Mapserver can provide an interactive internet map based on
custom GIS data.
%package -n %{libname}
Summary: Mapsserver library for mapserver or mapscript module
Group: System/Libraries
%description -n %{libname}
Mapserver library for mapserver or mapscript module. you need this lib to run mapserver
or any of the mapscript module (php, java, python, ruby)
# We don't require apache2_mod-php5 users could have php5 running
# with other modes (cgi, php-fpm etc)
%package -n php-mapscript
Summary: PHP/Mapscript map making extensions to PHP
Group: Development/Libraries/Other
Requires: %{libname} = %{version}-%{release}
Requires: apache2
Provides: php-mapserver = %{version}-%{release}
Obsoletes: php-mapserver < %{version}-%{release}
BuildRequires: php-devel
Requires: php
Requires: php-gd
%description -n php-mapscript
The PHP/Mapscript extension provides full map customization capabilities within the PHP scripting language.
%package -n perl-mapscript
Summary: Perl/Mapscript map making extensions to Perl
Group: Development/Languages/Perl
BuildRequires: perl-base
BuildRequires: perl(ExtUtils::MakeMaker)
Requires: %{libname} = %{version}-%{release}
Requires: perl-base
Provides: mapserver-perl = %{version}-%{release}
Obsoletes: mapserver-perl < %{version}-%{release}
%description -n perl-mapscript
The Perl/Mapscript extension provides full map customization capabilities
within the Perl programming language.
%if %{with python}
%package -n python-mapscript
Summary: Python/Mapscript map making extensions to Python
Group: Development/Languages/Python
%if %{suse_version} >= 1500
%define python_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Requires: python3-base
%else
%define python_sitearch %(python2 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")
BuildRequires: python2-devel
BuildRequires: python2-setuptools
Requires: python2-base
%endif
Requires: %{libname} = %{version}-%{release}
Provides: mapserver-python = %{version}-%{release}
Obsoletes: mapserver-python < %{version}-%{release}
%description -n python-mapscript
The Python/Mapscript extension provides full map customization capabilities
within the Python programming language.
%endif
%package -n libjavamapscript
Summary: Java/Mapscript map making extensions to Java
Group: Development/Languages/Java
BuildRequires: java >= 1.6
BuildRequires: java-devel >= 1.6
BuildRequires: swig
Requires: %{libname} = %{version}-%{release}
Requires: java >= 1.6
Requires: swig
Provides: java-mapscript = %{version}-%{release}
Provides: mapserver-java = %{version}-%{release}
Obsoletes: java-mapscript < %{version}-%{release}
Obsoletes: mapserver-java < %{version}-%{release}
%description -n libjavamapscript
The Java/Mapscript extension provides full map customization capabilities
within the Java programming language.
%if %{with ruby}
%package -n ruby-mapscript
Summary: Ruby/Mapscript map making extensions to Ruby
Group: Development/Languages/Ruby
BuildRequires: ruby-common
BuildRequires: ruby-devel
Requires: %{libname} = %{version}-%{release}
Requires: ruby
Provides: mapserver-ruby = %{version}-%{release}
Obsoletes: mapserver-ruby < %{version}-%{release}
%description -n ruby-mapscript
The Ruby/Mapscript extension provides full map customization capabilities
within the Ruby programming language.
%endif
%package devel
Summary: Mapserver development files
Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
%description devel
The Mapserver development package provides necessary files to build
against the C Mapserver library.
%prep
%setup -q -n %{name}-%{version}
%global _default_patch_fuzz 5
%patch0 -p0
%build
mkdir build
cd build
#Pre export the PREFIX ( having it on the command line doesn't expand correctly for
#dynamic postgresql location
export CMAKE_PREFIX_PATH="%{_includedir}:%{_includedir}/fastcgi:%%(pg_config --includedir):%%(pg_config --includedir-server):%%(pg_config --libdir)"
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
#specify all options and play with true/false
#so we always know which option are included in our build.
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DINSTALL_LIB_DIR=%{_libdir} \
-DCMAKE_C_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
-DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -fno-strict-aliasing" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DCMAKE_SKIP_RPATH=ON \
-DWITH_CAIRO=TRUE \
-DWITH_CLIENT_WFS=TRUE \
-DWITH_CLIENT_WMS=TRUE \
-DWITH_CURL=TRUE \
-DWITH_FCGI=TRUE \
-DWITH_FRIBIDI=TRUE \
-DWITH_GD=TRUE \
-DWITH_GDAL=TRUE \
-DWITH_GEOS=TRUE \
-DWITH_GIF=TRUE \
-DWITH_ICONV=TRUE \
-DWITH_JAVA=TRUE \
-DWITH_KML=TRUE \
-DWITH_LIBXML2=TRUE \
-DWITH_OGR=TRUE \
-DWITH_MYSQL=TRUE \
-DWITH_PERL=TRUE \
-DCUSTOM_PERL_SITE_ARCH_DIR="%{perl_vendorarch}" \
-DWITH_PHP=TRUE \
-DWITH_POSTGIS=TRUE \
-DWITH_PROJ=TRUE \
-DUSE_PROJ=TRUE \
-DWITH_PROTOBUFC=TRUE \
%if %{with python}
-DWITH_PYTHON=TRUE \
%endif
%if %{with ruby}
-DWITH_RUBY=TRUE \
%endif
-DWITH_SOS=TRUE \
-DWITH_THREAD_SAFETY=TRUE \
-DWITH_WCS=TRUE \
-DWITH_WMS=TRUE \
-DWITH_WFS=TRUE \
-DWITH_XMLMAPFILE=TRUE \
-DWITH_POINT_Z_M=TRUE \
-DWITH_APACHE_MODULE=FALSE \
-DWITH_SVGCAIRO=FALSE \
-DWITH_MYSQL=FALSE \
-DWITH_CSHARP=FALSE \
-DWITH_ORACLESPATIAL=FALSE \
-DWITH_ORACLE_PLUGIN=FALSE \
-DWITH_MSSQL2008=FALSE \
-DWITH_SDE=FALSE \
-DWITH_SDE_PLUGIN=FALSE \
-DWITH_EXEMPI=FALSE \
-Wno-dev \
..
%make_build
%check
# make test
%install
mkdir -p %{buildroot}/%{_sbindir}
mkdir -p %{buildroot}/%{_cgibindir}
mkdir -p %{buildroot}%{_libdir}/%{php_name}/extensions
mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}%{python_sitearch}/
mkdir -p %{buildroot}/%{_includedir}/%{name}
#Comment this look a bit wired to be useful sub-dir should also needed
# agg, etc
cp *.h %{buildroot}/%{_includedir}/%{name}/
# fix some exec bits essentially on examples to make rpmlint happy
# and avoid rpm adding require
find ./mapscript/ -type f -iname "*.p[ly]" -exec chmod -x {} \;
find ./mapscript/ -type f -iname "*.rb" -exec chmod -x {} \;
find ./mapscript/ -type f -iname "*.dist" -exec chmod -x {} \;
cd build
%make_install
cd ..
mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/
cat > %{buildroot}%{_sysconfdir}/%{php_name}/conf.d/mapscript.ini <<EOF
; Enable %{name} extension module
; For 6.4 we name the symlink here
extension=php_mapscript.so
EOF
# Install our links
#@ todo : check
# Having them as link is good for bytes, but httpd_daemon should allow
# reading those symlinks which is not the default
ln -s %{_bindir}/mapserv %{buildroot}%{_cgibindir}/mapserv
ln -s %{_bindir}/legend %{buildroot}%{_cgibindir}/legend
ln -s %{_bindir}/scalebar %{buildroot}%{_cgibindir}/scalebar
# remove vera fonts, these are provided system wide
#@todo then we should patch the fonts file example
rm -rf %{buildroot}%{_docdir}/%{name}/tests/vera
rm -rf %{buildroot}%{_docdir}/%{name}-%{version}/tests/vera
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files
%doc README.rst HISTORY.TXT
%doc MIGRATION_GUIDE.txt
%doc symbols tests
%doc fonts
%{_bindir}/shp2img
%{_bindir}/shptree
%{_bindir}/sortshp
%{_bindir}/tile4ms
%{_bindir}/mapserv
%{_bindir}/legend
%{_bindir}/scalebar
%{_bindir}/msencrypt
%{_bindir}/shptreetst
%{_bindir}/shptreevis
%{_cgibindir}/mapserv
%{_cgibindir}/legend
%{_cgibindir}/scalebar
%files -n %{libname}
%{_libdir}/libmapserver.so.*
%files -n php-mapscript
%doc mapscript/php/README
%doc mapscript/php/examples
%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/mapscript.ini
%{_libdir}/%{php_name}/extensions/php_mapscript.so*
%files -n perl-mapscript
%doc mapscript/perl/examples
%dir %{perl_vendorarch}/auto/mapscript
%{perl_vendorarch}/auto/mapscript/*
%{perl_vendorarch}/mapscript.pm
%if %{with python}
%files -n python-mapscript
%doc mapscript/python/README.rst
%doc mapscript/python/examples
%doc mapscript/python/tests
%{python_sitearch}/*
%endif
%files -n libjavamapscript
%doc mapscript/java/README
%doc mapscript/java/examples
%doc mapscript/java/tests
%{_libdir}/libjavamapscript.so
%if %{with ruby}
%files -n ruby-mapscript
%doc mapscript/ruby/README
%doc mapscript/ruby/examples
%{rb_sitearchdir}/mapscript.so
%endif
%files devel
%dir %{_includedir}/mapserver
%{_includedir}/mapserver/*
%{_libdir}/libmapserver.so
%{_datadir}/mapserver
%changelog
++++++ mapserver-7.6.1-fix_python_install_path.patch ++++++
Index: mapscript/python/CMakeLists.txt
===================================================================
--- mapscript/python/CMakeLists.txt.orig 2020-07-31 19:11:56.000000000 +0200
+++ mapscript/python/CMakeLists.txt 2020-09-05 14:44:10.142799065 +0200
@@ -146,7 +146,7 @@ install(
endif()
execute_process(
- COMMAND ${PYTHON_EXECUTABLE} setup.py install \${PYTHON_ROOT} \${PYTHON_PREFIX}
+ COMMAND ${PYTHON_EXECUTABLE} setup.py install --install-lib=${PYTHON_SITE_PACKAGES} \${PYTHON_ROOT} \${PYTHON_PREFIX}
WORKING_DIRECTORY ${OUTPUT_FOLDER}
)
"
++++++ mapserver-rpmlintrc ++++++
# for the shared-lib-call-exit here the explanation
# <tbonfort> we're not really a library, so no problem here...
# <tbonfort> we exit on a failed malloc, which isn't really recoverable anyways
addFilter("mapserver.*: W: shared-lib-calls-exit*")
# All those binary are sort of mapserv
addFilter("W: no-manual-page-for-binary sortshp")
addFilter("W: no-manual-page-for-binary shptreetst")
addFilter("W: no-manual-page-for-binary shptreevis")
addFilter("W: no-manual-page-for-binary shp2img")
addFilter("W: no-manual-page-for-binary tile4ms")
addFilter("W: no-manual-page-for-binary shptree")
addFilter("W: no-manual-page-for-binary msencrypt")
addFilter("W: no-manual-page-for-binary mapserv")
addFilter("W: no-manual-page-for-binary scalebar")
addFilter("W: no-manual-page-for-binary legend")
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package eiskaltdcpp for openSUSE:Factory checked in at 2021-03-30 20:56:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eiskaltdcpp (Old)
and /work/SRC/openSUSE:Factory/.eiskaltdcpp.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eiskaltdcpp"
Tue Mar 30 20:56:58 2021 rev:7 rq:868397 version:2.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/eiskaltdcpp/eiskaltdcpp.changes 2020-12-22 11:29:31.228931304 +0100
+++ /work/SRC/openSUSE:Factory/.eiskaltdcpp.new.2401/eiskaltdcpp.changes 2021-03-30 20:57:01.120494159 +0200
@@ -1,0 +2,17 @@
+Mon Feb 1 12:26:04 UTC 2021 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Trim metadata redundancies from descriptions. Fix grammar issues.
+
+-------------------------------------------------------------------
+Mon Feb 1 00:21:02 UTC 2021 - �������� ������������ <ilya(a)ilya.pp.ua>
+
+- The correct license is GPL-3.0-or-later.
+- Update to 2.4.1.
+ * https://github.com/eiskaltdcpp/eiskaltdcpp/blob/v2.4.1/ChangeLog.txt
+ * Fixed sending of hub commands containing %[mySID] parameter.
+ * Fix text in tooltip for system tray icon in KDE Plasma 5.
+ * Added new widget "Secretary" for searching magnet links and keywords.
+ * Fixed context menu for messages in private chats.
+- Refresh ru.ts.patch.
+
+-------------------------------------------------------------------
@@ -5 +22 @@
-- Add separete lang subpackeges: common-lang, qt-lang.
+- Add separate lang subpackages: common-lang, qt-lang.
Old:
----
eiskaltdcpp-2.4.0.tar.gz
New:
----
eiskaltdcpp-2.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eiskaltdcpp.spec ++++++
--- /var/tmp/diff_new_pack.xzQ2nn/_old 2021-03-30 20:57:01.968495109 +0200
+++ /var/tmp/diff_new_pack.xzQ2nn/_new 2021-03-30 20:57:01.968495109 +0200
@@ -1,7 +1,7 @@
#
# spec file for package eiskaltdcpp
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,10 +18,10 @@
%define sover 2_4
Name: eiskaltdcpp
-Version: 2.4.0
+Version: 2.4.1
Release: 0
-Summary: Cross-platform program that uses the Direct Connect and ADC protocol
-License: GPL-3.0-only
+Summary: Program that uses the Direct Connect and ADC protocols
+License: GPL-3.0-or-later
URL: https://github.com/%{name}/%{name}
Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{ve…
Source1: %{name}.firewalld
@@ -54,11 +54,11 @@
BuildRequires: pkgconfig(zlib)
%description
-This package contains EiskaltDC++ program with GUI based on Qt. This is the most stable,
-flexible and convenient GUI for EiskaltDC++.
-EiskaltDC++ is a cross-platform program that uses the Direct Connect and
-Advanced Direct Connect protocols. It is compatible with DC++, AirDC++, FlylinkDC++
-and other DC clients. EiskaltDC++ also interoperates with all common DC hub software.
+This package contains the EiskaltDC++ program with a GUI based on Qt.
+EiskaltDC++ is a program that uses the Direct Connect and Advanced
+Direct Connect protocols. It is compatible with DC++, AirDC++,
+FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with
+all common DC hub software.
%package common
Summary: Shared data for %{name}
@@ -81,11 +81,11 @@
Recommends: %{name}-qt-lang
%description qt
-This package contains EiskaltDC++ program with GUI based on Qt. This is the most stable,
-flexible and convenient GUI for EiskaltDC++.
-EiskaltDC++ is a cross-platform program that uses the Direct Connect and
-Advanced Direct Connect protocols. It is compatible with DC++, AirDC++, FlylinkDC++
-and other DC clients. EiskaltDC++ also interoperates with all common DC hub software.
+This package contains the EiskaltDC++ program with GUI based on Qt.
+EiskaltDC++ is a program that uses the Direct Connect and Advanced
+Direct Connect protocols. It is compatible with DC++, AirDC++,
+FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with
+all common DC hub software.
%package daemon
Summary: Daemon for %{name}
@@ -93,13 +93,16 @@
Suggests: %{name}-cli = %{version}
%description daemon
-This package installs only EiskaltDC++ daemon (without any GUI).
-Support of control via JSON-RPC is enabled. Look at EiskaltDC++ CLI and Web UI programs for controlling it.
-EiskaltDC++ Qt and GTK+ UI may be used for configuring of EiskaltDC++ daemon
-(they use the same settings from core library), but they should not be launched simultaneously.
-EiskaltDC++ is a cross-platform program that uses the Direct Connect and Advanced Direct Connect protocols.
-It is compatible with DC++, AirDC++, FlylinkDC++ and other DC clients.
-EiskaltDC++ also interoperates with all common DC hub software.
+This package contains only the EiskaltDC++ daemon, without any GUI.
+Support for control via JSON-RPC is enabled. The EiskaltDC++ CLI and
+Web UI programs can be used to control it.
+EiskaltDC++ Qt and GTK+ UI may be used for configuring the
+EiskaltDC++ daemon (they use the same settings from core library),
+but they should not be launched simultaneously.
+EiskaltDC++ is a program that uses the Direct Connect and Advanced
+Direct Connect protocols. It is compatible with DC++, AirDC++,
+FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with
+all common DC hub software.
%package cli
Summary: CLI frontend for %{name}
@@ -108,11 +111,12 @@
Suggests: %{name}-daemon = %{version}
%description cli
-This package installs EiskaltDC++ CLI (command-line interface) written in perl.
-This program is used to control EiskaltDC++ daemon via JSON-RPC protocol.
-EiskaltDC++ is a cross-platform program that uses the Direct Connect and Advanced Direct Connect protocols.
-It is compatible with DC++, AirDC++, FlylinkDC++ and other DC clients.
-EiskaltDC++ also interoperates with all common DC hub software.
+This package contains the EiskaltDC++ CLI (command-line interface) written in Perl.
+This program is used to control the EiskaltDC++ daemon via the JSON-RPC protocol.
+EiskaltDC++ is a program that uses the Direct Connect and Advanced
+Direct Connect protocols. It is compatible with DC++, AirDC++,
+FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with
+all common DC hub software.
%lang_package -n %{name}-common
%lang_package -n %{name}-qt
++++++ eiskaltdcpp-2.4.0.tar.gz -> eiskaltdcpp-2.4.1.tar.gz ++++++
++++ 119939 lines of diff (skipped)
++++++ ru.ts.patch ++++++
--- /var/tmp/diff_new_pack.xzQ2nn/_old 2021-03-30 20:57:02.884496135 +0200
+++ /var/tmp/diff_new_pack.xzQ2nn/_new 2021-03-30 20:57:02.888496140 +0200
@@ -1,18 +1,18 @@
-diff -Pdpru eiskaltdcpp.orig/eiskaltdcpp-qt/translations/ru.ts eiskaltdcpp/eiskaltdcpp-qt/translations/ru.ts
---- eiskaltdcpp.orig/eiskaltdcpp-qt/translations/ru.ts 2019-05-14 12:48:36.000000000 +0300
-+++ eiskaltdcpp/eiskaltdcpp-qt/translations/ru.ts 2019-05-14 13:07:44.847559964 +0300
-@@ -2102,12 +2102,12 @@ ������������������ ���������������������
+diff -Pdpru eiskaltdcpp-2.4.1.orig/eiskaltdcpp-qt/translations/ru.ts eiskaltdcpp-2.4.1/eiskaltdcpp-qt/translations/ru.ts
+--- eiskaltdcpp-2.4.1.orig/eiskaltdcpp-qt/translations/ru.ts 2021-01-24 14:06:31.000000000 +0300
++++ eiskaltdcpp-2.4.1/eiskaltdcpp-qt/translations/ru.ts 2021-02-01 03:05:07.159000294 +0300
+@@ -2115,12 +2115,12 @@ ������������������ ����������������������
<message>
- <location filename="../src/MainWindow.cpp" line="1714"/>
+ <location filename="../src/MainWindow.cpp" line="1728"/>
<source>Free %1</source>
- <translation>���������������� %1</translation>
+ <translation>%1 ����������������</translation>
</message>
<message>
- <location filename="../src/MainWindow.cpp" line="1717"/>
+ <location filename="../src/MainWindow.cpp" line="1731"/>
<source>Free %1 of %2</source>
- <translation>���������������� %1 ���� %2</translation>
+ <translation>%1 ���� %2 ����������������</translation>
</message>
<message>
- <location filename="../src/MainWindow.cpp" line="1764"/>
+ <location filename="../src/MainWindow.cpp" line="1778"/>
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package calamares for openSUSE:Factory checked in at 2021-03-30 20:56:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calamares (Old)
and /work/SRC/openSUSE:Factory/.calamares.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calamares"
Tue Mar 30 20:56:52 2021 rev:18 rq:872178 version:3.2.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/calamares/calamares.changes 2021-01-20 18:28:28.287575316 +0100
+++ /work/SRC/openSUSE:Factory/.calamares.new.2401/calamares.changes 2021-03-30 20:56:55.192487514 +0200
@@ -1,0 +2,41 @@
+Mon Feb 8 11:17:52 UTC 2021 - andy great <andythe_great(a)pm.me>
+
+- Update to version 3.2.36.
+ * It is now possible to hide the *next* and *back* buttons during
+ the "exec" phase of installation. Thanks Anubhav.
+ * The Calamares CI has migrated to GitHub actions. Thanks Jonas.
+ * *bootloader* now uses the current file names for the UEFI Secure
+ Boot shim instead of obsolete ones.
+ * The *mount* module creates swap in its own subvolume, if btrfs
+ is used.
+ * *partition* includes more information about what it will do,
+ including GPT partition types (in human-readable format, if
+ possible).
+ * Some edge-cases with overlay filesystems have been resolved in
+ the *partition* module.
+ * During the creation of filesystems and partitions, automounting
+ is turned off (if DBus is available, and the host system supports
+ KDE Solid automount control). This should reduce the number of
+ failed installations if automount grabs partitions while they
+ are being created. The code is prepared to handle other ways
+ to control automount-behavior as well.
+
+-------------------------------------------------------------------
+Sun Jan 31 18:07:15 UTC 2021 - <opensuse.lietuviu.kalba(a)gmail.com>
+
+- Update to version 3.2.35.1:
+ * The partition module now supports a not-full-disk-encryption setup,
+ where /boot is not encrypted, but the rest of the system is.
+ * Fixed issue then the initcpiocfg module would sometimes configure
+ the system to ask for a passphrase, when none is needed.
+ * The plasmalnf module has been substantially rewritten, so that
+ it can support a QML version of the module in future. The UI has
+ changed a little, and now displays more themes than before.
+- Add patch 3.2-networkcfg.patch to prevent writing
+ /etc/resolv.conf as a regular file ��� let openSUSE to create it as
+ a symlink automatically.
+- Set default source directory to "/run/overlay/rootfsbase" as
+ it is with Kiwi from 9.21.18 (in older Kiwi was "/run/rootfsbase").
+ See https://github.com/OSInside/kiwi/issues/1558
+
+-------------------------------------------------------------------
@@ -4,0 +46,18 @@
+
+-------------------------------------------------------------------
+Fri Nov 20 10:50:18 UTC 2020 - andy great <andythe_great(a)pm.me>
+
+- Update to version 3.2.34.
+ * Modules
+ * The *keyboard* module had a regression in which it no-longer
+ painted the keycaps in the keyboard preview.
+ * The *plasmalnf* module did not set all of the look-and-feel
+ values in the target system. (reported by Bluestar Linux)
+ * In the *users* module, warnings about the strength of the
+ password are now correctly pluralized when possible.
+ * In the *users* module, if ICU is installed, the user's full
+ name is automatically transliterated to US-ASCII
+ (for some locales; this will need tweaking) so that the login
+ name is acceptable.
+- Rebase 3.2.15-unpackfs.conf_Leap15.patch
+- Fix spec file, license file move to LICENSES/GPL-3.0-or-later.txt
Old:
----
calamares-3.2.27.tar.gz
calamares-3.2.27.tar.gz.asc
New:
----
3.2-networkcfg.patch
calamares-3.2.36.tar.gz
calamares-3.2.36.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calamares.spec ++++++
--- /var/tmp/diff_new_pack.Re7b8N/_old 2021-03-30 20:56:56.176488618 +0200
+++ /var/tmp/diff_new_pack.Re7b8N/_new 2021-03-30 20:56:56.184488627 +0200
@@ -21,7 +21,7 @@
%define _sover 3
Name: calamares
-Version: 3.2.27
+Version: 3.2.36
Release: 0
Summary: Installer from a live CD/DVD/USB to disk
License: GPL-3.0-or-later
@@ -44,6 +44,7 @@
Patch6: 3.2.15-configuring_autologin_in_sysconfig.patch
Patch7: 3.2-removeuser.conf.patch
Patch8: 3.2-welcome.conf.patch
+Patch9: 3.2-networkcfg.patch
Provides: %{name}-libs%{_sover} = %{version}
Obsoletes: %{name}-libs%{_sover} < %{version}
BuildRequires: cmake >= 3.2
@@ -131,9 +132,9 @@
%package branding-upstream
Summary: Branding for %{name}
-Group: System/Management
# This theme is nor pure upstream, nor specific to openSUSE,
# but is close to upstream
+Group: System/Management
Supplements: packageand(%name:branding-upstream)
%if 0%{?sle_version} == 150000
Conflicts: otherproviders(%{name}-branding)
@@ -202,7 +203,7 @@
# https://github.com/calamares/calamares/issues/729
%files
-%license LICENSE
+%license LICENSES/GPL-3.0-or-later.txt
%doc AUTHORS
%{_mandir}/*/*
%{_bindir}/%{name}
@@ -226,12 +227,12 @@
#%%files -f %%{name}-dummypythonqt.lang
%files webview
-%license LICENSE
+%license LICENSES/GPL-3.0-or-later.txt
%{_datadir}/%{name}/modules/webview.conf
%{_libdir}/%{name}/modules/webview/
%files branding-upstream
-%license LICENSE
+%license LICENSES/GPL-3.0-or-later.txt
%{_datadir}/%{name}/settings.conf
%dir %{_datadir}/%{name}/branding/
%{_datadir}/%{name}/branding/default/
++++++ 3.2-networkcfg.patch ++++++
Description: Disable creation of /etc/resolv.conf
Author: Lorenzo "Palinuro" Faletra <palinuro(a)parrotsec.org>
Updated by Mindaugas <opensuse.lietuviu.kalba(a)gmail.com>
After copying /etc/resolv.conf, it will be a regular file,
but in openSUSE it should be to /var/run/netconfig/resolv.conf
and created automatically anyway.
--- a/src/modules/networkcfg/main.py 2020-12-07 18:09:14.000000000 +0200
+++ b/src/modules/networkcfg/main.py 2021-01-31 19:47:20.012191085 +0200
@@ -69,21 +69,21 @@
pass
# We need to overwrite the default resolv.conf in the chroot.
- source_resolv = "/etc/resolv.conf"
- target_resolv = os.path.join(root_mount_point, "etc/resolv.conf")
- if source_resolv != target_resolv and os.path.exists(source_resolv):
- try:
- os.remove(target_resolv)
- except Exception as err:
- libcalamares.utils.debug(
- "Couldn't remove {}: {}".format(target_resolv, err)
- )
+ #source_resolv = "/etc/resolv.conf"
+ #target_resolv = os.path.join(root_mount_point, "etc/resolv.conf")
+ #if source_resolv != target_resolv and os.path.exists(source_resolv):
+ # try:
+ # os.remove(target_resolv)
+ # except Exception as err:
+ # libcalamares.utils.debug(
+ # "Couldn't remove {}: {}".format(target_resolv, err)
+ # )
- try:
- shutil.copy(source_resolv, target_resolv)
- except Exception as err:
- libcalamares.utils.debug(
- "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
- )
+ # try:
+ # shutil.copy(source_resolv, target_resolv)
+ # except Exception as err:
+ # libcalamares.utils.debug(
+ # "Can't copy resolv.conf from {}: {}".format(source_resolv, err)
+ # )
return None
++++++ 3.2.15-unpackfs.conf_Leap15.patch ++++++
--- /var/tmp/diff_new_pack.Re7b8N/_old 2021-03-30 20:56:56.240488689 +0200
+++ /var/tmp/diff_new_pack.Re7b8N/_new 2021-03-30 20:56:56.240488689 +0200
@@ -1,29 +1,37 @@
-Adjust some default settings (default shipped .conf files) for openSUSE Leap 15
-and openSUSE Leap 15 based appliances.
+Keep in mind, that Kiwi (2020-10-08) changed its overlay path into:
+ source: "/run/overlay/rootfsbase"
+With older Kiwi, please use:
+ source: "/run/rootfsbase"
+See also:
+https://github.com/OSInside/kiwi/issues/1558
+https://github.com/OSInside/kiwi/commit/89f85e45041eb39f686f6b20f909a20bb48277cc#diff-473d8885cf8c5da1798144d6eaeb94c386af31c776c34336331040ca49b667d8
-diff --git a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf
---- a/src/modules/unpackfs/unpackfs.conf
-+++ b/src/modules/unpackfs/unpackfs.conf
-@@ -79,11 +79,15 @@
+diff -ruN a/src/modules/unpackfs/unpackfs.conf b/src/modules/unpackfs/unpackfs.conf
+--- a/src/modules/unpackfs/unpackfs.conf 2020-11-16 18:28:28.000000000 +0700
++++ b/src/modules/unpackfs/unpackfs.conf 2020-11-19 22:47:42.918846533 +0700
+@@ -88,13 +88,15 @@
# for its destination name, as in the example below.
unpack:
- - source: ../CHANGES
- sourcefs: file
- destination: "/tmp/changes.txt"
+- weight: 1 # Single file
- - source: src/qml/calamares/slideshow
- sourcefs: file
- destination: "/tmp/slideshow/"
- exclude: [ "*.qmlc", "qmldir" ]
-+ # - source: ../CHANGES
-+ # sourcefs: file
-+ # destination: "/tmp/changes.txt"
-+ - source: "/run/rootfsbase"
+- weight: 5 # Lots of files
+- # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
++# - source: ../CHANGES
++# sourcefs: file
++# destination: "/tmp/changes.txt"
++ - source: "/run/overlay/rootfsbase"
+ sourcefs: "ext4"
+ destination: "/"
+ exclude: [ "/etc/dracut.conf.d/02-livecd.conf" ]
-+ # - source: src/qml/calamares/slideshow
-+ # sourcefs: file
-+ # destination: "/tmp/slideshow/"
-+ # exclude: [ "*.qmlc", "qmldir" ]
- # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
++# - source: src/qml/calamares/slideshow
++# sourcefs: file
++# destination: "/tmp/slideshow/"
++# exclude: [ "*.qmlc", "qmldir" ]
++# excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt
++++++ calamares-3.2.27.tar.gz -> calamares-3.2.36.tar.gz ++++++
++++ 467721 lines of diff (skipped)
1
0