Hello community, here is the log from the commit of package libcomps for openSUSE:Factory checked in at 2020-06-07 21:38:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcomps (Old) and /work/SRC/openSUSE:Factory/.libcomps.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcomps" Sun Jun 7 21:38:59 2020 rev:7 rq:812119 version:0.1.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libcomps/libcomps.changes 2019-12-03 15:22:03.694515639 +0100 +++ /work/SRC/openSUSE:Factory/.libcomps.new.3606/libcomps.changes 2020-06-07 21:39:05.897598445 +0200 @@ -1,0 +2,8 @@ +Sat Jun 6 22:27:58 UTC 2020 - Neal Gompa <[email protected]> + +- Upgrade to 0.1.15 + + Do not skip type=mandatory in xml output and test it (rh#1771224) + + Remove unused global variable UnfoObjListIt (rh#1793424) + + Make inline function __comps_objmrtree_all also static (rh#1793424) + +------------------------------------------------------------------- Old: ---- libcomps-0.1.14.tar.gz New: ---- libcomps-0.1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcomps.spec ++++++ --- /var/tmp/diff_new_pack.Z13CaT/_old 2020-06-07 21:39:06.869601527 +0200 +++ /var/tmp/diff_new_pack.Z13CaT/_new 2020-06-07 21:39:06.873601540 +0200 @@ -2,7 +2,7 @@ # spec file for package libcomps # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2019 Neal Gompa <[email protected]>. +# Copyright (c) 2020 Neal Gompa <[email protected]>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define major 0 %define minor 1 -%define patch 14 +%define patch 15 %define libname %{name}%{major} %define devname %{name}-devel ++++++ libcomps-0.1.14.tar.gz -> libcomps-0.1.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/src/comps_docpackage.c new/libcomps-libcomps-0.1.15/libcomps/src/comps_docpackage.c --- old/libcomps-libcomps-0.1.14/libcomps/src/comps_docpackage.c 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/src/comps_docpackage.c 2020-03-31 11:39:29.000000000 +0200 @@ -164,8 +164,9 @@ str = "conditional"; else str = "default"; - if (pkg->type != COMPS_PACKAGE_MANDATORY) - ret = xmlTextWriterWriteAttribute(writer, BAD_CAST "type", BAD_CAST str); + + ret = xmlTextWriterWriteAttribute(writer, BAD_CAST "type", BAD_CAST str); + if (pkg->requires) { str = comps_object_tostr((COMPS_Object*)pkg->requires); ret = xmlTextWriterWriteAttribute(writer, (xmlChar*) "requires", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/src/comps_objlist.h new/libcomps-libcomps-0.1.15/libcomps/src/comps_objlist.h --- old/libcomps-libcomps-0.1.14/libcomps/src/comps_objlist.h 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/src/comps_objlist.h 2020-03-31 11:39:29.000000000 +0200 @@ -34,7 +34,7 @@ struct COMPS_ObjListIt { COMPS_Object *comps_obj; COMPS_ObjListIt *next; -} UnfoObjListIt; +}; /** COMPS_Object derivate representing category element in comps.xml structure*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/src/comps_objmradix.c new/libcomps-libcomps-0.1.15/libcomps/src/comps_objmradix.c --- old/libcomps-libcomps-0.1.14/libcomps/src/comps_objmradix.c 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/src/comps_objmradix.c 2020-03-31 11:39:29.000000000 +0200 @@ -605,7 +605,7 @@ free(pair); } -inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) { +static inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) { COMPS_HSList *to_process, *ret; COMPS_HSListItem *hsit, *oldit; size_t x; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/src/python/src/CMakeLists.txt new/libcomps-libcomps-0.1.15/libcomps/src/python/src/CMakeLists.txt --- old/libcomps-libcomps-0.1.14/libcomps/src/python/src/CMakeLists.txt 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/src/python/src/CMakeLists.txt 2020-03-31 11:39:29.000000000 +0200 @@ -44,13 +44,11 @@ if (NOT SKBUILD) if (${pversion} EQUAL 2) - find_package (PythonLibs 2.6) - find_package (PythonInterp 2.6 REQUIRED) + find_package (PythonInterp 2 EXACT REQUIRED) else () - find_package (PythonLibs 3.0) - find_package (PythonInterp 3.0) - #add_custom_target(py3-copy) + find_package (PythonInterp 3 EXACT REQUIRED) endif () + find_package (PythonLibs) endif(NOT SKBUILD) include_directories(${PYTHON_INCLUDE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/src/python/tests/__test.py new/libcomps-libcomps-0.1.15/libcomps/src/python/tests/__test.py --- old/libcomps-libcomps-0.1.14/libcomps/src/python/tests/__test.py 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/src/python/tests/__test.py 2020-03-31 11:39:29.000000000 +0200 @@ -620,6 +620,14 @@ self.assertTrue(hash(pkg2) != hash(pkg3)) self.assertTrue(len(set([pkg1,pkg2,pkg3])) == 2) + def test_mandatory_in_xml_out(self): + self.comps = libcomps.Comps() + self.comps.groups.append(libcomps.Group("g1", "group1", "group desc", 0, 0, 0, "en")) + self.comps.groups[0].packages.append(libcomps.Package("kernel", libcomps.PACKAGE_TYPE_MANDATORY)) + + out = self.comps.xml_str() + self.assertTrue("<packagereq type=\"mandatory\" requires=\"\">kernel</packagereq>" in out) + #@unittest.skip("skip") class DictTest(unittest.TestCase): def test_dict(self): @@ -998,7 +1006,7 @@ self.assertEqual(len(comps2.groups), 0) self.assertEqual(len(comps2.categories), 0) self.assertEqual(len(comps2.environments), 0) - + s = comps.toxml_str(xml_options={"empty_groups": True, "empty_categories": True, "empty_environments": True}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps/version.cmake new/libcomps-libcomps-0.1.15/libcomps/version.cmake --- old/libcomps-libcomps-0.1.14/libcomps/version.cmake 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps/version.cmake 2020-03-31 11:39:29.000000000 +0200 @@ -1,5 +1,5 @@ set (libcomps_VERSION_MAJOR 0) set (libcomps_VERSION_MINOR 1) -set (libcomps_VERSION_PATCH 14) +set (libcomps_VERSION_PATCH 15) set (libcomps_RELEASE 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/libcomps.spec new/libcomps-libcomps-0.1.15/libcomps.spec --- old/libcomps-libcomps-0.1.14/libcomps.spec 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/libcomps.spec 2020-03-31 11:39:29.000000000 +0200 @@ -13,7 +13,7 @@ %endif Name: libcomps -Version: 0.1.14 +Version: 0.1.15 Release: 1%{?dist} Summary: Comps XML file manipulation library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/rel-eng/packages/.readme new/libcomps-libcomps-0.1.15/rel-eng/packages/.readme --- old/libcomps-libcomps-0.1.14/rel-eng/packages/.readme 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/rel-eng/packages/.readme 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -the rel-eng/packages directory contains metadata files -named after their packages. Each file has the latest tagged -version and the project's relative directory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/rel-eng/packages/libcomps new/libcomps-libcomps-0.1.15/rel-eng/packages/libcomps --- old/libcomps-libcomps-0.1.14/rel-eng/packages/libcomps 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/rel-eng/packages/libcomps 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0.1.14-1 ./ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/rel-eng/tito.props new/libcomps-libcomps-0.1.15/rel-eng/tito.props --- old/libcomps-libcomps-0.1.14/rel-eng/tito.props 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/rel-eng/tito.props 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -[globalconfig] -default_builder = tito.builder.Builder -default_tagger = tito.tagger.VersionTagger -changelog_do_not_remove_cherrypick = 0 -changelog_format = %s (%ae) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/version.cmake new/libcomps-libcomps-0.1.15/version.cmake --- old/libcomps-libcomps-0.1.14/version.cmake 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/version.cmake 2020-03-31 11:39:29.000000000 +0200 @@ -1,5 +1,5 @@ set (libcomps_VERSION_MAJOR 0) set (libcomps_VERSION_MINOR 1) -set (libcomps_VERSION_PATCH 6) -set (libcomps_RELEASE 4) +set (libcomps_VERSION_PATCH 15) +set (libcomps_RELEASE 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcomps-libcomps-0.1.14/version.json new/libcomps-libcomps-0.1.15/version.json --- old/libcomps-libcomps-0.1.14/version.json 2019-12-03 14:00:39.000000000 +0100 +++ new/libcomps-libcomps-0.1.15/version.json 2020-03-31 11:39:29.000000000 +0200 @@ -2,5 +2,5 @@ "libcomps_VERSION_MAJOR": 0, "libcomps_RELEASE": 1, "libcomps_VERSION_MINOR": 1, - "libcomps_VERSION_PATCH": 14 + "libcomps_VERSION_PATCH": 15 }
