Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at 2019-09-05 12:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-check-suse (Old) and /work/SRC/openSUSE:Factory/.brp-check-suse.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brp-check-suse" Thu Sep 5 12:09:11 2019 rev:61 rq:721541 version:84.87+git20190807.d5563f2 Changes: -------- --- /work/SRC/openSUSE:Factory/brp-check-suse/brp-check-suse.changes 2019-07-29 17:23:42.778361700 +0200 +++ /work/SRC/openSUSE:Factory/.brp-check-suse.new.7948/brp-check-suse.changes 2019-09-05 12:09:17.295864199 +0200 @@ -1,0 +2,21 @@ +Wed Aug 07 14:06:17 UTC 2019 - mli...@suse.cz + +- Update to version 84.87+git20190807.d5563f2: + * Strip .gnu.debuglto_* and __gnu_lto_v1 in archives. + +------------------------------------------------------------------- +Mon Aug 5 13:11:53 UTC 2019 - Benjamin Greiner <c...@bnavigator.de> + +- Update to version 84.87+git20190801.8862c43 + * remove python 2.5 check (#19) + * remove legacy brp-60-hook check (#20) +- rerequest changes from git20190729.e01ed36 + +------------------------------------------------------------------- +Mon Jul 29 08:09:45 UTC 2019 - co...@suse.com + +- Update to version 84.87+git20190729.e01ed36: + * make desktop category error message more meaningful (#17) + * redefine Science and Education to comply with guidelines (#18) + +------------------------------------------------------------------- Old: ---- brp-check-suse-84.87+git20190702.bac0cab.tar.xz New: ---- brp-check-suse-84.87+git20190807.d5563f2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.7mgiVe/_old 2019-09-05 12:09:18.319864008 +0200 +++ /var/tmp/diff_new_pack.7mgiVe/_new 2019-09-05 12:09:18.319864008 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0-or-later Group: Development/Tools/Building Requires: perl -Version: 84.87+git20190702.bac0cab +Version: 84.87+git20190807.d5563f2 Release: 0 Url: https://github.com/openSUSE/brp-check-suse # ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.7mgiVe/_old 2019-09-05 12:09:18.347864002 +0200 +++ /var/tmp/diff_new_pack.7mgiVe/_new 2019-09-05 12:09:18.347864002 +0200 @@ -1,5 +1,5 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/brp-check-suse.git</param> - <param name="changesrevision">13ed30b788930d5e274740990e83b48d3df454eb</param></service> + <param name="changesrevision">9aa67a9a3ea7c68abcf47093fcfe84482b9f8046</param></service> </servicedata> \ No newline at end of file ++++++ brp-check-suse-84.87+git20190702.bac0cab.tar.xz -> brp-check-suse-84.87+git20190807.d5563f2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-15-strip-debug new/brp-check-suse-84.87+git20190807.d5563f2/brp-15-strip-debug --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-15-strip-debug 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-15-strip-debug 2019-08-07 14:37:22.000000000 +0200 @@ -37,7 +37,7 @@ case $(file "$f") in *"current ar"*|*ELF*", not stripped"*) chmod u+w "$f" || : - strip -p --discard-locals -R .comment -R .note -R .gnu.lto_* "$f" || : + strip -p --discard-locals -R .comment -R .note -R .gnu.lto_* -R .gnu.debuglto_* -N __gnu_lto_v1 "$f" || : ;; *) echo "WARNING: Strange looking archive $(file $f)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-50-check-python new/brp-check-suse-84.87+git20190807.d5563f2/brp-50-check-python --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-50-check-python 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-50-check-python 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#!/bin/bash - -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi - -if [ ! -e /usr/include/python/Python.h ]; then - exit 0 -fi - -TMPDIR="$(mktemp -d /tmp/ssizecheck-XXXXXX)" - -find /usr/src/packages/BUILD/ -iname '**.c' -print0 | \ -xargs -r0 python /usr/lib/rpm/brp-check-python.data/ssizecheck.py > "$TMPDIR/$$" - -test -f /.buildenv && . /.buildenv - -cat "$TMPDIR/$$" - -if [ "${BUILD_BASENAME:0:4}" = "beta" ]; then - test -s "$TMPDIR/$$" && echo "please see http://www.python.org/dev/peps/pep-0353/ for hints" -fi - -rm -rf "$TMPDIR" - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-60-hook new/brp-check-suse-84.87+git20190807.d5563f2/brp-60-hook --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-60-hook 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-60-hook 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/sh -# If using normal root, avoid changing anything. -if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then - exit 0 -fi - -if [ -e "$RPM_SOURCE_DIR/brp-hook" ] ; then - sh "$RPM_SOURCE_DIR/brp-hook" || exit 1 -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-check-python.data/ssizecheck.py new/brp-check-suse-84.87+git20190807.d5563f2/brp-check-python.data/ssizecheck.py --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-check-python.data/ssizecheck.py 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-check-python.data/ssizecheck.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,219 +0,0 @@ -# $Id$ -# look for modified API functions, based on input by MAL and MvL. - -# usage: python ssizecheck.py mysources/*.c - -# see also: http://www.python.org/dev/peps/pep-0353 - -import glob, re, os, sys - -def check(file): - for lineno, text in enumerate(open(file)): - for token in re.findall("\w+", text): - if token in API_OUTPUT: - message = "WARNING: %r uses Py_ssize_t for output"\ - " parameters (must fix!)" - elif token in API_RETURN: - message = "%r uses Py_ssize_t for return values"\ - " (may need overflow check)" - elif token in API: - message = "%r uses Py_ssize_t for input parameters" - elif token in FUNCPTR: - if token == "inquiry": - message = "%%r should be perhaps replaced with %r" - else: - message = "WARNING: %%r must be replaced with %r" - message = message % FUNCPTR[token] - else: - continue - print "%s:%d: %s" % (file, lineno+1, message % token) - -# -------------------------------------------------------------------- - -# all changed/new APIs (from MAL): - -API = set(""" -PyBuffer_FromMemory -PyBuffer_FromObject -PyBuffer_FromReadWriteMemory -PyBuffer_FromReadWriteObject -PyBuffer_New -PyDict_Next -PyDict_Size -PyInt_AsSsize_t -PyInt_FromSsize_t -PyInt_FromUnicode -PyList_GetItem -PyList_GetSlice -PyList_Insert -PyList_New -PyList_SetItem -PyList_SetSlice -PyList_Size -PyLong_FromUnicode -PyMapping_Length -PyMapping_Size -PyMarshal_ReadObjectFromString -PyObject_AsCharBuffer -PyObject_AsReadBuffer -PyObject_AsWriteBuffer -PyObject_InitVar -PyObject_Length -PyObject_Size -PySequence_DelItem -PySequence_DelSlice -PySequence_GetItem -PySequence_GetSlice -PySequence_InPlaceRepeat -PySequence_Length -PySequence_Repeat -PySequence_SetItem -PySequence_SetSlice -PySequence_Size -PySlice_GetIndices -PySlice_GetIndicesEx -PyString_AsStringAndSize -PyString_Decode -PyString_DecodeEscape -PyString_Encode -PyString_FromStringAndSize -PyString_Size -PyTuple_GetItem -PyTuple_GetSlice -PyTuple_New -PyTuple_Pack -PyTuple_SetItem -PyTuple_Size -PyType_GenericAlloc -PyUnicodeDecodeError_Create -PyUnicodeDecodeError_GetEnd -PyUnicodeDecodeError_GetStart -PyUnicodeDecodeError_SetEnd -PyUnicodeDecodeError_SetStart -PyUnicodeEncodeError_Create -PyUnicodeEncodeError_GetEnd -PyUnicodeEncodeError_GetStart -PyUnicodeEncodeError_SetEnd -PyUnicodeEncodeError_SetStart -PyUnicodeTranslateError_Create -PyUnicodeTranslateError_GetEnd -PyUnicodeTranslateError_GetStart -PyUnicodeTranslateError_SetEnd -PyUnicodeTranslateError_SetStart -PyUnicode_AsWideChar -PyUnicode_Count -PyUnicode_Decode -PyUnicode_DecodeASCII -PyUnicode_DecodeCharmap -PyUnicode_DecodeLatin1 -PyUnicode_DecodeMBCS -PyUnicode_DecodeRawUnicodeEscape -PyUnicode_DecodeUTF16 -PyUnicode_DecodeUTF16Stateful -PyUnicode_DecodeUTF7 -PyUnicode_DecodeUTF8 -PyUnicode_DecodeUTF8Stateful -PyUnicode_DecodeUnicodeEscape -PyUnicode_Encode -PyUnicode_EncodeASCII -PyUnicode_EncodeCharmap -PyUnicode_EncodeDecimal -PyUnicode_EncodeLatin1 -PyUnicode_EncodeMBCS -PyUnicode_EncodeRawUnicodeEscape -PyUnicode_EncodeUTF16 -PyUnicode_EncodeUTF7 -PyUnicode_EncodeUTF8 -PyUnicode_EncodeUnicodeEscape -PyUnicode_Find -PyUnicode_FromUnicode -PyUnicode_FromWideChar -PyUnicode_GetSize -PyUnicode_RSplit -PyUnicode_Replace -PyUnicode_Resize -PyUnicode_Split -PyUnicode_Tailmatch -PyUnicode_TranslateCharmap -_PyEval_SliceIndex -_PyLong_AsSsize_t -_PyLong_FromSsize_t -_PyLong_New -_PyObject_GC_NewVar -_PyObject_GC_Resize -_PyObject_LengthHint -_PyObject_NewVar -_PyString_Resize -_PyTuple_Resize -""".split()) - -# Py_ssize_t output parameters (these MUST be fixed) (from MAL) - -API_OUTPUT = set(""" -PyDict_Next -PyObject_AsCharBuffer -PyObject_AsReadBuffer -PyObject_AsWriteBuffer -PySlice_GetIndices -PySlice_GetIndicesEx -PyString_AsStringAndSize -PyUnicodeDecodeError_GetEnd -PyUnicodeDecodeError_GetStart -PyUnicodeEncodeError_GetEnd -PyUnicodeEncodeError_GetStart -PyUnicodeTranslateError_GetEnd -PyUnicodeTranslateError_GetStart -PyUnicode_DecodeUTF8Stateful -_PyEval_SliceIndex -""".split()) - -# Py_ssize_t return values (these may need overflow checks) (from MAL) - -API_RETURN = set(""" -PyDict_Size -PyInt_AsSsize_t -PyList_Size -PyMapping_Length -PyMapping_Size -PyObject_Length -PyObject_Size -PySequence_Length -PySequence_Size -PyString_Size -PyTuple_Size -PyUnicode_AsWideChar -PyUnicode_Count -PyUnicode_Find -PyUnicode_GetSize -PyUnicode_Tailmatch -_PyLong_AsSsize_t -_PyObject_LengthHint -""".split()) - -# function pointer types (from MvL) - -# note that "inquiry" is still used for some slots (nb_nonzero, -# tp_clear, and tp_is_gc); the others MUST be always be fixed. - -FUNCPTR = { - "intargfunc": "ssizeargfunc", - "intintargfunc": "ssizessizeargfunc", - "intobjargproc": "ssizeobjargproc", - "intintobjargproc": "ssizessizeobjargproc", - "inquiry": "lenfunc", - "getreadbufferproc": "readbufferproc", - "getwritebufferproc": "writebufferproc", - "getsegcountproc": "segcountproc", - "getcharbufferproc": "charbufferproc", -} - -if __name__ == "__main__": - for arg in sys.argv[1:]: - if os.path.isdir(arg): - arg = os.path.join(arg, "*.c") # assume C - if glob.has_magic(arg): - files = glob.glob(arg) - else: - files = [arg] - for file in files: - check(file) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-desktop.data/applications.menu new/brp-check-suse-84.87+git20190807.d5563f2/brp-desktop.data/applications.menu --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-desktop.data/applications.menu 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-desktop.data/applications.menu 2019-08-07 14:37:22.000000000 +0200 @@ -166,42 +166,39 @@ <Include> <And> <Category>Science</Category> - <Or> + <Not> + <Category>X-SuSE-Core-Science</Category> <Category>Art</Category> - <Category>Artificial Intelligence</Category> + <Category>ArtificialIntelligence</Category> + <Category>Astronomy</Category> <Category>Biology</Category> - <Category>Construction</Category> + <Category>Chemistry</Category> <Category>ComputerScience</Category> + <Category>Construction</Category> + <Category>DataVisualization</Category> <Category>Economy</Category> + <Category>Electricity</Category> + <Category>Engineering</Category> + <Category>Geography</Category> <Category>Geology</Category> <Category>Geoscience</Category> <Category>History</Category> <Category>Humanities</Category> <Category>ImageProcessing</Category> + <Category>Languages</Category> <Category>Literature</Category> <Category>Maps</Category> - <Category>MedicalSoftware</Category> - <Category>Physics</Category> - <Category>Robotics</Category> - <Category>Sports</Category> - <Category>Electronics</Category> - <Category>Engineering</Category> - <Category>Electricity</Category> - <Category>Construction</Category> - </Or> - <Not> - <Category>X-SuSE-Core-Science</Category> - <Category>Astronomy</Category> - <Category>Chemistry</Category> - <Category>DataVisualization</Category> - <Category>Geography</Category> <Category>Math</Category> + <Category>MedicalSoftware</Category> <Category>NumericalAnalysis</Category> <Category>ParallelComputing</Category> - <Category>Languages</Category> + <Category>Physics</Category> + <Category>Robotics</Category> <Category>Spirituality</Category> + <Category>Sports</Category> <Category>X-KDE-Edu-Teaching</Category> <Category>X-KDE-Edu-Language</Category> + <Category>Language</Category> </Not> </And> </Include> @@ -212,9 +209,12 @@ <Include> <And> <Category>Science</Category> - <Category>Languages</Category> + <Or> + <Category>Languages</Category> + <Category>Language</Category> + <Category>X-KDE-Edu-Language</Category> + </Or> </And> - <Category>X-KDE-Edu-Language</Category> </Include> </Menu> <Menu> @@ -224,21 +224,42 @@ <And> <Category>Science</Category> <Or> - <Category>DataVisualization</Category> <Category>Math</Category> <Category>NumericalAnalysis</Category> + </Or> + </And> + </Include> + </Menu> + <Menu> + <Name>Computer Science</Name> + <Directory>suse-science-computerscience.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Or> + <Category>ComputerScience</Category> <Category>ParallelComputing</Category> </Or> </And> </Include> </Menu> <Menu> - <Name>Chemistry</Name> - <Directory>suse-science-chemical.directory</Directory> + <Name>Art</Name> + <Directory>suse-science-art.directory</Directory> <Include> <And> <Category>Science</Category> - <Category>Chemistry</Category> + <Category>Art</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Artificial Intelligence</Name> + <Directory>suse-science-artificialintelligence.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>ArtificialIntelligence</Category> </And> </Include> </Menu> @@ -253,6 +274,76 @@ </Include> </Menu> <Menu> + <Name>Biology</Name> + <Directory>suse-science-biology.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Biology</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Chemistry</Name> + <Directory>suse-science-chemistry.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Chemistry</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Construction</Name> + <Directory>suse-science-construction.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Construction</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>DataVisualization</Name> + <Directory>suse-science-datavisualization.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>DataVisualization</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Economy</Name> + <Directory>suse-science-economy.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Economy</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Electricity</Name> + <Directory>suse-science-electricity.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Electricity</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Engineering</Name> + <Directory>suse-science-engineering.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Engineering</Category> + </And> + </Include> + </Menu> + <Menu> <Name>Geography</Name> <Directory>suse-science-geography.directory</Directory> <Include> @@ -262,6 +353,136 @@ </And> </Include> </Menu> + <Menu> + <Name>Geology</Name> + <Directory>suse-science-geology.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Geology</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Geoscience</Name> + <Directory>suse-science-geoscience.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Geoscience</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>History</Name> + <Directory>suse-science-history.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>History</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Humanities</Name> + <Directory>suse-science-humanities.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Humanities</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>ImageProcessing</Name> + <Directory>suse-science-imageprocessing.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>ImageProcessing</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Literature</Name> + <Directory>suse-science-literature.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Literature</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Maps</Name> + <Directory>suse-science-maps.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Maps</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Math</Name> + <Directory>suse-science-math.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Math</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>MedicalSoftware</Name> + <Directory>suse-science-medicalsoftware.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>MedicalSoftware</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Physics</Name> + <Directory>suse-science-physics.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Physics</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Robotics</Name> + <Directory>suse-science-robotics.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Robotics</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Spirituality</Name> + <Directory>suse-science-spirituality.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Spirituality</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Sports</Name> + <Directory>suse-science-sports.directory</Directory> + <Include> + <And> + <Category>Science</Category> + <Category>Sports</Category> + </And> + </Include> + </Menu> </Menu> <Menu> <Name>Education</Name> @@ -275,43 +496,41 @@ <Include> <And> <Category>Education</Category> - <Or> + <Not> + <Category>X-SuSE-Core-Education</Category> + <Category>Art</Category> <Category>ArtificialIntelligence</Category> - <Category>ComputerScience</Category> + <Category>Astronomy</Category> <Category>Biology</Category> + <Category>Chemistry</Category> + <Category>ComputerScience</Category> + <Category>Construction</Category> + <Category>DataVisualization</Category> <Category>Economy</Category> - <Category>Electronics</Category> + <Category>Electricity</Category> + <Category>Engineering</Category> + <Category>Geography</Category> <Category>Geology</Category> <Category>Geoscience</Category> <Category>History</Category> <Category>Humanities</Category> <Category>ImageProcessing</Category> + <Category>Languages</Category> <Category>Literature</Category> <Category>Maps</Category> + <Category>Math</Category> <Category>MedicalSoftware</Category> + <Category>Music</Category> + <Category>NumericalAnalysis</Category> + <Category>ParallelComputing</Category> <Category>Physics</Category> <Category>Robotics</Category> <Category>Spirituality</Category> <Category>Sports</Category> - </Or> - <Not> - <Category>X-SuSE-Core-Education</Category> - <Category>Astronomy</Category> - <Category>Chemistry</Category> - <Category>DataVisualization</Category> - <Category>Geography</Category> - <Category>Math</Category> - <Category>NumericalAnalysis</Category> - <Category>ParallelComputing</Category> - <Category>Languages</Category> - <Category>Engineering</Category> - <Category>Electricity</Category> - <Category>Construction</Category> - <Category>Music</Category> <Category>Teaching</Category> - <Category>Art</Category> <Category>X-KDE-Edu-Teaching</Category> <Category>X-KDE-Edu-Language</Category> + <Category>Language</Category> </Not> </And> </Include> @@ -324,6 +543,7 @@ <Category>Education</Category> <Or> <Category>Languages</Category> + <Category>Language</Category> <Category>X-KDE-Edu-Language</Category> </Or> </And> @@ -336,17 +556,68 @@ <And> <Category>Education</Category> <Or> - <Category>DataVisualization</Category> <Category>Math</Category> <Category>NumericalAnalysis</Category> + </Or> + </And> + </Include> + </Menu> + <Menu> + <Name>Computer Science</Name> + <Directory>suse-education-computerscience.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Or> + <Category>ComputerScience</Category> <Category>ParallelComputing</Category> </Or> </And> </Include> </Menu> <Menu> + <Name>Art</Name> + <Directory>suse-education-art.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Art</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>ArtificialIntelligence</Name> + <Directory>suse-education-artificialintelligence.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>ArtificialIntelligence</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Astronomy</Name> + <Directory>suse-education-astronomy.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Astronomy</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Biology</Name> + <Directory>suse-education-biology.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Biology</Category> + </And> + </Include> + </Menu> + <Menu> <Name>Chemistry</Name> - <Directory>suse-education-chemical.directory</Directory> + <Directory>suse-education-chemistry.directory</Directory> <Include> <And> <Category>Education</Category> @@ -355,46 +626,62 @@ </Include> </Menu> <Menu> - <Name>Music</Name> - <Directory>suse-education-music.directory</Directory> + <Name>ComputerScience</Name> + <Directory>suse-education-computerscience.directory</Directory> <Include> <And> <Category>Education</Category> - <Category>Music</Category> - <Not><Category>AudioVideo</Category></Not> + <Category>ComputerScience</Category> </And> </Include> </Menu> <Menu> - <Name>Teaching</Name> - <Directory>suse-education-teaching.directory</Directory> + <Name>Construction</Name> + <Directory>suse-education-construction.directory</Directory> <Include> <And> <Category>Education</Category> - <Or> - <Category>X-KDE-Edu-Teaching</Category> - <Category>Teaching</Category> - </Or> + <Category>Construction</Category> </And> </Include> </Menu> <Menu> - <Name>Art</Name> - <Directory>suse-education-art.directory</Directory> + <Name>DataVisualization</Name> + <Directory>suse-education-datavisualization.directory</Directory> <Include> <And> <Category>Education</Category> - <Category>Art</Category> + <Category>DataVisualization</Category> </And> </Include> </Menu> <Menu> - <Name>Astronomy</Name> - <Directory>suse-education-astronomy.directory</Directory> + <Name>Economy</Name> + <Directory>suse-education-economy.directory</Directory> <Include> <And> <Category>Education</Category> - <Category>Astronomy</Category> + <Category>Economy</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Electricity</Name> + <Directory>suse-education-electricity.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Electricity</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Engineering</Name> + <Directory>suse-education-engineering.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Engineering</Category> </And> </Include> </Menu> @@ -409,16 +696,142 @@ </Include> </Menu> <Menu> - <Name>Construction</Name> - <Directory>suse-education-construction.directory</Directory> + <Name>Geology</Name> + <Directory>suse-education-geology.directory</Directory> <Include> <And> <Category>Education</Category> - <Or> - <Category>Electricity</Category> - <Category>Engineering</Category> - <Category>Construction</Category> - </Or> + <Category>Geology</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Geoscience</Name> + <Directory>suse-education-geoscience.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Geoscience</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>History</Name> + <Directory>suse-education-history.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>History</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Humanities</Name> + <Directory>suse-education-humanities.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Humanities</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>ImageProcessing</Name> + <Directory>suse-education-imageprocessing.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>ImageProcessing</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Literature</Name> + <Directory>suse-education-literature.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Literature</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Maps</Name> + <Directory>suse-education-maps.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Maps</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Math</Name> + <Directory>suse-education-math.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Math</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>MedicalSoftware</Name> + <Directory>suse-education-medicalsoftware.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>MedicalSoftware</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Music</Name> + <Directory>suse-education-music.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Music</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Physics</Name> + <Directory>suse-education-physics.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Physics</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Robotics</Name> + <Directory>suse-education-robotics.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Robotics</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Spirituality</Name> + <Directory>suse-education-spirituality.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Spirituality</Category> + </And> + </Include> + </Menu> + <Menu> + <Name>Sports</Name> + <Directory>suse-education-sports.directory</Directory> + <Include> + <And> + <Category>Education</Category> + <Category>Sports</Category> </And> </Include> </Menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-84.87+git20190702.bac0cab/brp-desktop.data/xdg_menu new/brp-check-suse-84.87+git20190807.d5563f2/brp-desktop.data/xdg_menu --- old/brp-check-suse-84.87+git20190702.bac0cab/brp-desktop.data/xdg_menu 2019-07-02 13:15:39.000000000 +0200 +++ new/brp-check-suse-84.87+git20190807.d5563f2/brp-desktop.data/xdg_menu 2019-08-07 14:37:22.000000000 +0200 @@ -1851,7 +1851,7 @@ $validate_error = 1; } if ( $menu->{Name} eq 'Applications' or $menu->{Name} eq 'More Programs' ) { - $output .= "ERROR: No sufficient Category definition: $desktop->{file} \n"; + $output .= "ERROR: No sufficient Category definition \"$desktop->{Categories}\" in $desktop->{file} \n"; $output .= "Please refer to https://en.opensuse.org/openSUSE:Packaging_desktop_menu_categories\n";; $validate_error = 1; }
