@@ -1,7 +1,7 @@

 Summary:	Low-level libraries useful for providing data structure handling for C.

 Name:		glib

 Version:	2.58.0

-Release:	6%{?dist}

+Release:	7%{?dist}

 License:	LGPLv2+

 URL:		https://developer.gnome.org/glib/

 Group:		Applications/System

@@ -20,6 +20,7 @@ BuildRequires:	python3

 BuildRequires:	python3-libs

 BuildRequires:	util-linux-devel

 BuildRequires:	elfutils-libelf-devel

+BuildRequires:	gtk-doc

 Requires:	elfutils-libelf

 Requires:	pcre-libs

 Requires:	libffi

@@ -55,6 +56,14 @@ Requires:	glib

 %description schemas

 Gsettings schemas compiling tool

+%package doc

+Summary: Documentation for Glib

+Requires: %{name} = %{version}-%{release}

+BuildArch: noarch

+

+%description doc

+The glib-doc package includes documentation for the GLib library.

+

 %prep

 %setup -q

 %patch0 -p1

@@ -69,7 +78,8 @@ if [ %{_host} != %{_build} ]; then

 fi

 %configure \

     --with-pcre=system \

-    --with-sysroot=/target-%{_arch}

+    --with-sysroot=/target-%{_arch} \

+    --enable-gtk-doc

 make %{?_smp_mflags}

 %install

 make DESTDIR=%{buildroot} install

@@ -105,7 +115,13 @@ make DESTDIR=%{buildroot} install

 %{_bindir}/gsettings

 %{_datadir}/glib-2.0/schemas/*

+%files doc

+%defattr(-, root, root)

+%doc %{_datadir}/gtk-doc/html/*

+

 %changelog

+*   Thu Aug 13 2020 Ankit Jain <ankitja@vmware.com> 2.58.0-7

+-   Enabled gtk-doc

 *   Tue Jun 23 2020 Tapas Kundu <tkundu@vmware.com> 2.58.0-6

 -   Build with python3

 -   Mass removal python2

@@ -3,7 +3,7 @@

 Name:           gobject-introspection

 Summary:        Introspection system for GObject-based libraries

 Version:        1.58.0

-Release:        3%{?dist}

+Release:        4%{?dist}

 Group:          Development/Libraries

 License:        GPLv2+, LGPLv2+, MIT

 URL:            http://live.gnome.org/GObjectIntrospection

@@ -37,6 +37,7 @@ Summary:        Python3 package for handling GObject introspection data

 Group:          Development/Languages

 Requires:       %{name} = %{version}-%{release}

 Requires:       python3-xml

+Requires:       python3-libs

 Requires:       python3

 %description -n python3-gobject-introspection

 This package contains a Python package for handling the introspection

@@ -105,6 +106,8 @@ make  %{?_smp_mflags} check

 %doc %{_mandir}/man1/*.gz

 %changelog

+*   Thu Aug 13 2020 Ankit Jain <ankitja@vmware.com> 1.58.0-4

+-   Requires python3-libs

 *   Mon Jun 22 2020 Tapas Kundu <tkundu@vmware.com> 1.58.0-3

 -   Mass removal python2

 *   Mon Dec 10 2018 Alexey Makhalov <amakhalov@vmware.com> 1.58.0-2

deleted file mode 100644

@@ -1,82 +0,0 @@

-Summary:       Mozilla's JavaScript engine.

-Name:          js

-Version:       1.8.5

-Release:       4%{?dist}

-Group:         Applications/System

-Vendor:        VMware, Inc.

-License:       GPLv2+ or LGPLv2+ or MPLv1.1

-URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5

-Source0:       https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz

-Patch0:        mozjs-aarch64-support.patch

-Distribution:  Photon

-BuildRequires: autoconf

-BuildRequires: ncurses-devel

-BuildRequires: nspr-devel >= 4.7

-BuildRequires: zip

-Requires:      ncurses

-Requires:      nspr

-%define sha1 js185=52a01449c48d7a117b35f213d3e4263578d846d6

-%define ExtraBuildRequires python2 python2-devel python2-libs

-%description

-Mozilla's JavaScript engine includes a just-in-time compiler (JIT) that compiles

-JavaScript to machine code, for a significant speed increase.

-

-%package devel

-Summary:        js devel

-Group:          Development/Tools

-Requires:       %{name} = %{version}

-%description devel

-This contains development tools and libraries for SpiderMonkey.

-

-%prep

-%setup -q

-%patch0 -p1

-

-%build

-cd js/src

-%configure \

-    --datadir=%{_datarootdir} \

-    --with-system-nspr \

-    --enable-threadsafe \

-    --enable-readline

-make CXX=g++ CXXFLAGS='-std=gnu++98 -DXP_UNIX=1 -DJS_THREADSAFE=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1'

-

-%install

-cd js/src

-make DESTDIR=%{buildroot} install

-pushd %{buildroot}/%{_libdir}

-ln -fs libmozjs185.so.1.0.0 libmozjs185.so.1.0

-ln -fs libmozjs185.so.1.0 libmozjs185.so

-popd

-find %{buildroot} -name '*.la' -delete

-

-%post

-/sbin/ldconfig

-

-%postun

-/sbin/ldconfig

-

-%files

-%defattr(-,root,root)

-%{_bindir}/js-config

-%{_libdir}/libmozjs185.so.*

-

-%files devel

-%defattr(-,root,root)

-%{_includedir}/%{name}/*

-%{_libdir}/libmozjs185-1.0.a

-%{_libdir}/libmozjs185.so

-%{_libdir}/pkgconfig/mozjs185.pc

-

-%changelog

-*   Tue Jun 23 2020 Tapas Kundu <tkundu@vmware.com> 1.8.5-4

--   Build with python3

--   Mass removal python2

-*   Tue Jan 08 2019 Alexey Makhalov <amakhalov@vmware.com> 1.8.5-3

--   Added BuildRequires python2

-*   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.5-2

--   Aarch64 support

-*   Thu Oct 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.5-1

--   mozjs v1.8.5.

-*   Fri May 22 2015 Alexey Makhalov <amakhalov@vmware.com> 17.0.0-1

--   initial version

deleted file mode 100644

@@ -1,52 +0,0 @@

-+++ a/js/src/Makefile.in

-@@ -382,7 +382,7 @@ CPPSRCS += 	checks.cc \

- # END enclude sources for V8 dtoa

- #############################################

-

--ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))

-+ifeq (,$(filter-out aarch64 powerpc sparc,$(TARGET_CPU)))

-

- VPATH +=	$(srcdir)/assembler \

- 		$(srcdir)/assembler/wtf \

-+++ a/js/src/assembler/jit/ExecutableAllocator.h

-@@ -391,6 +391,12 @@ public:

-     {

-         CacheRangeFlush(code, size, CACHE_SYNC_ALL);

-     }

-+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX

-+    static void cacheFlush(void* code, size_t size)

-+    {

-+        intptr_t end = reinterpret_cast<intptr_t>(code) + size;

-+        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));

-+    }

- #else

-     #error "The cacheFlush support is missing on this platform."

- #endif

-+++ a/js/src/assembler/wtf/Platform.h

-@@ -292,6 +292,10 @@

-

- #endif /* ARM */

-

-+/* CPU(AArch64) - 64-bit ARM */

-+#if defined(__aarch64__)

-+#define WTF_CPU_AARCH64 1

-+#endif

-

-

- /* Operating systems - low-level dependencies */

-+++ a/js/src/configure.in

-@@ -1534,6 +1534,10 @@ arm*)

-     CPU_ARCH=arm

-     ;;

-

-+aarch64)

-+    CPU_ARCH=aarch64

-+    ;;

-+

- mips|mipsel)

-     CPU_ARCH="mips"

-     ;;

@@ -2,19 +2,20 @@

 Summary:        Module manipulating metadata files

 Name:           libmodulemd

-Version:        2.4.0

-Release:        2%{?dist}

+Version:        2.9.4

+Release:        1%{?dist}

 License:        MIT

 URL:            https://github.com/fedora-modularity/libmodulemd

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/fedora-modularity/libmodulemd/archive/%{name}-%{version}.tar.gz

-%define sha1    %{name}-%{version}=b832bdd33e80901f2fa7946ebafdec3ee8e4853f

+%define sha1    %{name}-%{version}=b2070336eddf5ce26250c90e824ae5c4bdf4733e

 BuildRequires:  meson

 BuildRequires:  clang-devel

 BuildRequires:  gcc

-BuildRequires:  glib

+BuildRequires:  glib-devel

+BuildRequires:  glib-doc

 BuildRequires:  valgrind

 BuildRequires:  gobject-introspection-devel

 BuildRequires:  python3-pygobject

@@ -22,6 +23,7 @@ BuildRequires:  python3-pycodestyle

 BuildRequires:  python3-autopep8

 BuildRequires:  gtk-doc

 BuildRequires:  libyaml-devel

+BuildRequires:  file-devel

 Requires:       libyaml

 %description

@@ -38,8 +40,8 @@ It contains the libraries and header files.

 %setup -q -n %{name}-%{name}-%{version}

 %build

-meson -Dprefix=%{_prefix} -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false \

-       -Dwith_py3_overrides=true -Dwith_py2_overrides=false api1

+meson -Dprefix=%{_prefix} -Ddeveloper_build=false -Dwith_py2=false \

+      -Dwith_manpages=disabled api1

 cd api1

 ninja

@@ -52,19 +54,21 @@ DESTDIR=%{buildroot}/ ninja install

 %files

 %doc README.md

-%{_bindir}/modulemd-validator-v1

-%{_libdir}/girepository-1.0/Modulemd-1.0.typelib

+%{_bindir}/modulemd-validator

+%{_libdir}/girepository-1.0/Modulemd-2.0.typelib

 %{_libdir}/libmodulemd.so.*

-%{_datadir}/gir-1.0/Modulemd-1.0.gir

-%{_datadir}/gtk-doc/html/modulemd-1.0/*

+%{_datadir}/gir-1.0/Modulemd-2.0.gir

+%{_datadir}/gtk-doc/html/modulemd-2.0/*

 %{python3_sitelib}/*

 %files  devel

 %{_libdir}/libmodulemd.so

-%{_libdir}/pkgconfig/modulemd.pc

-%{_includedir}/modulemd/*

+%{_libdir}/pkgconfig/*.pc

+%{_includedir}/modulemd-2.0/*.h

 %changelog

+*   Thu Aug 13 2020 Ankit Jain <ankitja@vmware.com> 2.9.4-1

+-   Updated to 2.9.4

 *   Thu Oct 24 2019 Ankit Jain <ankitja@vmware.com> 2.4.0-2

 -   Added for ARM Build

 *   Wed May 15 2019 Ankit Jain <ankitja@vmware.com> 2.4.0-1

@@ -3,15 +3,15 @@

 Summary:        Repodata downloading library

 Name:           librepo

-Version:        1.10.2

-Release:        3%{?dist}

+Version:        1.12.0

+Release:        1%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/rpm-software-management/librepo

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/rpm-software-management/librepo/archive/%{name}-%{version}.tar.gz

-%define sha1    %{name}-%{version}=9709bbca874a1afda9dff1c1775a3c68321c7182

+%define sha1    %{name}-%{version}=1981d485743337c93d2b098920e5f738bd41fdc9

 BuildRequires:  cmake

 BuildRequires:  gcc

 BuildRequires:  check

@@ -81,6 +81,8 @@ popd

 %{_python3_sitearch}/%{name}/

 %changelog

+*   Thu Aug 13 2020 Ankit Jain <ankitja@vmware.com> 1.12.0-1

+-   Updated to 1.12.0

 *   Mon Jun 15 2020 Tapas Kundu <tkundu@vmware.com> 1.10.2-3

 -   Mass removal python2

 *   Thu Oct 24 2019 Ankit Jain <ankitja@vmware.com> 1.10.2-2

new file mode 100644

@@ -0,0 +1,235 @@

+From 321bb2ac1bd4a88addfd2875f467d2e24b8a0005 Mon Sep 17 00:00:00 2001

+From: Michael Schroeder <mls@suse.de>

+Date: Fri, 5 Oct 2018 14:41:20 +0200

+Subject: [PATCH] Add selection_make_matchsolvable and

+ selection_make_matchsolvablelist

+

+This is like pool_whatmatchessolvable, but works on a selection.

+The advantage is that it supports filtering.

+---

+ examples/solv/solv.c |  36 ++---------

+ src/libsolv.ver      |   2 +

+ src/selection.c      | 149 ++++++++++++++++++++++++++++++++++++++++++-

+ src/selection.h      |   6 +-

+ 4 files changed, 162 insertions(+), 31 deletions(-)

+

+diff --git a/src/libsolv.ver b/src/libsolv.ver

+index a3fa19a..9f6d324 100644

+--- a/src/libsolv.ver

+@@ -249,6 +249,8 @@ SOLV_1.0 {

+ 		selection_make;

+ 		selection_make_matchdepid;

+ 		selection_make_matchdeps;

++		selection_make_matchsolvable;

++		selection_make_matchsolvablelist;

+ 		selection_solvables;

+ 		solv_bin2hex;

+ 		solv_calloc;

+diff --git a/src/selection.c b/src/selection.c

+index d44c482..22ad3b0 100644

+--- a/src/selection.c

+@@ -1430,6 +1430,137 @@ matchdep(Pool *pool, Id id, char *rname, int rflags, Id revr, int flags)

+   return matchdep_str(rname, pool_id2str(pool, id), flags);

+ }

+ 

++static int

++selection_make_matchsolvable_common_limited(Pool *pool, Queue *selection, Queue *solvidq, Id solvid, int flags, int keyname, int marker, struct limiter *limiter)

++{

++  Id *wp;

++  Map m, missc;

++  int reloff, boff;

++  int li, i, j;

++  Id p;

++  Queue q;

++

++  if (solvidq)

++    {

++      map_init(&m, pool->nsolvables);

++      for (i = 0; i < solvidq->count; i++)

++	MAPSET(&m, solvidq->elements[i]);

++    }

++  queue_init(&q);

++  reloff = pool->ss.nstrings;

++  map_init(&missc, reloff + pool->nrels);

++  for (li = limiter->start; li < limiter->end; li++)

++    {

++      Solvable *s;

++      p = limiter->mapper ? limiter->mapper[li] : li;

++      if (solvidq && MAPTST(&m, p))

++	continue;

++      if (!solvidq && p == solvid)

++	continue;

++      s = pool->solvables + p;

++      if (!s->repo || (limiter->repofilter && s->repo != limiter->repofilter))

++	continue;

++      if (s->arch == ARCH_SRC || s->arch == ARCH_NOSRC)

++	{

++	  if (!(flags & SELECTION_SOURCE_ONLY) && !(flags & SELECTION_WITH_SOURCE))

++	    continue;

++	  if (!(flags & SELECTION_WITH_DISABLED) && pool_disabled_solvable(pool, s))

++	    continue;

++	}

++      else

++	{

++	  if ((flags & SELECTION_SOURCE_ONLY) != 0)

++	    continue;

++	  if (s->repo != pool->installed)

++	    {

++	      if (!(flags & SELECTION_WITH_DISABLED) && pool_disabled_solvable(pool, s))

++		continue;

++	      if (!(flags & SELECTION_WITH_BADARCH) && pool_badarch_solvable(pool, s))

++		continue;

++	    }

++	}

++      if (q.count)

++	queue_empty(&q);

++      repo_lookup_deparray(s->repo, p, keyname, &q, marker);

++      if (!q.count)

++	continue;

++      for (i = 0; i < q.count; i++)

++	{

++	  Id dep = q.elements[i];

++	  boff = ISRELDEP(dep) ? reloff + GETRELID(dep) : dep;

++	  if (MAPTST(&missc, boff))

++	    continue;

++	  if (ISRELDEP(dep))

++	    {

++	      Reldep *rd = GETRELDEP(pool, dep);

++	      if (!ISRELDEP(rd->name) && rd->flags < 8)

++		{

++		  /* do pre-filtering on the base */

++		  if (MAPTST(&missc, rd->name))

++		    continue;

++		  wp = pool_whatprovides_ptr(pool, rd->name);

++		  if (solvidq)

++		    {

++		      for (wp = pool_whatprovides_ptr(pool, dep); *wp; wp++)

++			if (MAPTST(&m, *wp))

++			  break;

++		    }

++		  else

++		    {

++		      for (wp = pool_whatprovides_ptr(pool, dep); *wp; wp++)

++			if (*wp == solvid)

++			  break;

++		    }

++		  if (!*wp)

++		    {

++		      /* the base does not include solvid, no need to check the complete dep */

++		      MAPSET(&missc, rd->name);

++		      MAPSET(&missc, boff);

++		      continue;

++		    }

++		}

++	    }

++	  wp = pool_whatprovides_ptr(pool, dep);

++	  if (solvidq)

++	    {

++	      for (wp = pool_whatprovides_ptr(pool, dep); *wp; wp++)

++		if (MAPTST(&m, *wp))

++		  break;

++	    }

++	  else

++	    {

++	      for (wp = pool_whatprovides_ptr(pool, dep); *wp; wp++)

++		if (*wp == solvid)

++		  break;

++	    }

++	  if (*wp)

++	    {

++	      queue_push(selection, p);

++	      break;

++	    }

++	  MAPSET(&missc, boff);

++	}

++    }

++  queue_free(&q);

++  map_free(&missc);

++  if (solvidq)

++    map_free(&m);

++  if (!selection->count)

++    return 0;

++

++  /* convert package list to selection */

++  j = selection->count;

++  queue_insertn(selection, 0, selection->count, 0);

++  for (i = 0; i < selection->count; )

++    {

++      selection->elements[i++] = SOLVER_SOLVABLE | SOLVER_NOAUTOSET;

++      selection->elements[i++] = selection->elements[j++];

++    }

++  if ((flags & SELECTION_FLAT) != 0)

++    selection_flatten(pool, selection);

++  return SELECTION_PROVIDES;

++}

++

+ static int

+ selection_make_matchdeps_common_limited(Pool *pool, Queue *selection, const char *name, Id dep, int flags, int keyname, int marker, struct limiter *limiter)

+ {

+@@ -1449,6 +1580,9 @@ selection_make_matchdeps_common_limited(Pool *pool, Queue *selection, const char

+   if (name && dep)

+     return 0;

+ 

++  if ((flags & SELECTION_MATCH_SOLVABLE) != 0)

++    return selection_make_matchsolvable_common_limited(pool, selection, (Queue *)name, dep, flags, keyname, marker, limiter);

++

+   if ((flags & SELECTION_MATCH_DEPSTR) != 0)

+     flags &= ~SELECTION_REL;

+ 

+@@ -1558,7 +1692,8 @@ selection_make_matchdeps_common_limited(Pool *pool, Queue *selection, const char

+ 	  queue_push(selection, p);

+ 	  continue;

+ 	}

+-      queue_empty(&q);

++      if (q.count)

++        queue_empty(&q);

+       repo_lookup_deparray(s->repo, p, keyname, &q, marker);

+       if (!q.count)

+ 	continue;

+@@ -1708,6 +1843,18 @@ selection_make_matchdepid(Pool *pool, Queue *selection, Id dep, int flags, int k

+   return selection_make_matchdeps_common(pool, selection, 0, dep, flags, keyname, marker);

+ }

+ 

++int

++selection_make_matchsolvable(Pool *pool, Queue *selection, Id solvid, int flags, int keyname, int marker)

++{

++  return selection_make_matchdeps_common(pool, selection, 0, solvid, flags | SELECTION_MATCH_SOLVABLE, keyname, marker);

++}

++

++int

++selection_make_matchsolvablelist(Pool *pool, Queue *selection, Queue *solvidq, int flags, int keyname, int marker)

++{

++  return selection_make_matchdeps_common(pool, selection, (const char *)solvidq, 0, flags | SELECTION_MATCH_SOLVABLE, keyname, marker);

++}

++

+ static inline int

+ pool_is_kind(Pool *pool, Id name, Id kind)

+ {

+diff --git a/src/selection.h b/src/selection.h

+index 9938c2f..f3ed2c2 100644

+--- a/src/selection.h

+@@ -52,16 +52,20 @@ extern "C" {

+ #define SELECTION_SUBTRACT		(2 << 28)

+ #define SELECTION_FILTER		(3 << 28)

+ 

+-#define SELECTION_MODEBITS		(3 << 28)	/* internal */

+ 

+ /* extra SELECTION_FILTER bits */

+ #define SELECTION_FILTER_KEEP_IFEMPTY	(1 << 30)

+ #define SELECTION_FILTER_SWAPPED	(1 << 31)

+ 

++/* internal */

++#define SELECTION_MATCH_SOLVABLE	(1 << 27)

++#define SELECTION_MODEBITS		(3 << 28)

+ 

+ extern int  selection_make(Pool *pool, Queue *selection, const char *name, int flags);

+ extern int  selection_make_matchdeps(Pool *pool, Queue *selection, const char *name, int flags, int keyname, int marker);

+ extern int  selection_make_matchdepid(Pool *pool, Queue *selection, Id dep, int flags, int keyname, int marker);

++extern int selection_make_matchsolvable(Pool *pool, Queue *selection, Id solvid, int flags, int keyname, int marker);

++extern int selection_make_matchsolvablelist(Pool *pool, Queue *selection, Queue *solvidq, int flags, int keyname, int marker);

+ 

+ extern void selection_filter(Pool *pool, Queue *sel1, Queue *sel2);

+ extern void selection_add(Pool *pool, Queue *sel1, Queue *sel2);

new file mode 100644

@@ -0,0 +1,105 @@

+From aac9f0c2d791fa96bc9423231050f9e18fb973d6 Mon Sep 17 00:00:00 2001

+From: Jaroslav Mracek <jmracek@redhat.com>

+Date: Thu, 17 Jan 2019 12:48:05 +0100

+Subject: [PATCH] Add support for modular updateinfo.xml data

+

+Module advisory data can specify which advisory is applicable for which

+modular stream. Module information can be absent or there could be

+multiple entries.

+

+If there is a module entry in advisory and none of modules in advisory

+is enabled on the system, advisory is not relevant for the system and

+should be ignored.

+---

+ ext/repo_updateinfoxml.c | 37 +++++++++++++++++++++++++++++++++++++

+ src/knownid.h            |  8 ++++++++

+ 2 files changed, 45 insertions(+)

+

+diff --git a/ext/repo_updateinfoxml.c b/ext/repo_updateinfoxml.c

+index 7ba0062..5e03105 100644

+--- a/ext/repo_updateinfoxml.c

+@@ -37,6 +37,7 @@

+  *     <pkglist>

+  *       <collection short="F8">

+  *         <name>Fedora 8</name>

++ *         <module name="pki-deps" stream="10.6" version="20181019123559" context="9edba152" arch="x86_64"/>

+  *         <package arch="ppc64" name="imlib-debuginfo" release="6.fc8" src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm" version="1.9.15">

+  *           <filename>imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm</filename>

+  *           <reboot_suggested>True</reboot_suggested>

+@@ -70,6 +71,7 @@ enum state {

+   STATE_RELOGIN,

+   STATE_RIGHTS,

+   STATE_SEVERITY,

++  STATE_MODULE,

+   NUMSTATES

+ };

+ 

+@@ -92,6 +94,7 @@ static struct solv_xmlparser_element stateswitches[] = {

+   { STATE_PKGLIST,     "collection",      STATE_COLLECTION,  0 },

+   { STATE_COLLECTION,  "name",            STATE_NAME,        1 },

+   { STATE_COLLECTION,  "package",         STATE_PACKAGE,     0 },

++  { STATE_COLLECTION,  "module",          STATE_MODULE,      0 },

+   { STATE_PACKAGE,     "filename",        STATE_FILENAME,    1 },

+   { STATE_PACKAGE,     "reboot_suggested",STATE_REBOOT,      1 },

+   { STATE_PACKAGE,     "restart_suggested",STATE_RESTART,    1 },

+@@ -321,6 +324,40 @@ startElement(struct solv_xmlparser *xmlp, int state, const char *name, const cha

+ 	  repodata_set_id(pd->data, pd->collhandle, UPDATE_COLLECTION_ARCH, a);

+         break;

+       }

++    case STATE_MODULE:

++      {

++        const char *name = 0, *stream = 0, *version = 0, *context = 0, *arch = 0;

++        Id name_id, stream_id, version_id, context_id, arch_id = 0;

++        for (; *atts; atts += 2)

++          {

++            if (!strcmp(*atts, "arch"))

++              arch = atts[1];

++            else if (!strcmp(*atts, "name"))

++              name = atts[1];

++            else if (!strcmp(*atts, "stream"))

++              stream = atts[1];

++            else if (!strcmp(*atts, "version"))

++              version = atts[1];

++            else if (!strcmp(*atts, "context"))

++              context = atts[1];

++          }

++        name_id = pool_str2id(pool, name, 1);

++        if (arch)

++          arch_id = pool_str2id(pool, arch, 1);

++        stream_id = pool_str2id(pool, stream, 1);

++        version_id = pool_str2id(pool, version, 1);

++        context_id = pool_str2id(pool, context, 1);

++

++        Id module_handle = repodata_new_handle(pd->data);

++        repodata_set_id(pd->data, module_handle, UPDATE_MODULE_NAME, name_id);

++        repodata_set_id(pd->data, module_handle, UPDATE_MODULE_STREAM, stream_id);

++        repodata_set_id(pd->data, module_handle, UPDATE_MODULE_VERSION, version_id);

++        repodata_set_id(pd->data, module_handle, UPDATE_MODULE_CONTEXT, context_id);

++        if (arch_id)

++          repodata_set_id(pd->data, module_handle, UPDATE_MODULE_ARCH, arch_id);

++        repodata_add_flexarray(pd->data, pd->handle, UPDATE_MODULE, module_handle);

++        break;

++      }

+ 

+     default:

+       break;

+diff --git a/src/knownid.h b/src/knownid.h

+index 64cc6fc..14d2ded 100644

+--- a/src/knownid.h

+@@ -262,6 +262,14 @@ KNOWNID(SOLVABLE_INSTALLSTATUS,		"solvable:installstatus"),	/* debian install st

+ 

+ KNOWNID(SOLVABLE_PREREQ_IGNOREINST,	"solvable:prereq_ignoreinst"),	/* ignore these pre-requires for installed packages */

+ 

++/* 'content' of patch, usually list of modules */

++KNOWNID(UPDATE_MODULE,                  "update:module"),              /*  "name stream version context arch" */

++KNOWNID(UPDATE_MODULE_NAME,             "update:module:name"),         /*   name */

++KNOWNID(UPDATE_MODULE_STREAM,           "update:module:stream"),       /*   stream */

++KNOWNID(UPDATE_MODULE_VERSION,          "update:module:version"),      /*   version */

++KNOWNID(UPDATE_MODULE_CONTEXT,          "update:module:context"),      /*   context */

++KNOWNID(UPDATE_MODULE_ARCH,             "update:module:arch"),         /*   architecture */

++

+ KNOWNID(ID_NUM_INTERNAL,		0)

+ 

+ #ifdef KNOWNID_INITIALIZE

@@ -1,7 +1,7 @@

 Summary:        A free package dependency solver

 Name:           libsolv

 Version:        0.6.35

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz

@@ -9,6 +9,9 @@ Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.t

 Patch0:         libsolv-xmlparser.patch

 Patch1:         libsolv-rpm4-IndexOoB-fix.patch

 Patch2:         CVE-2019-20387.patch

+# These 2 patches are required to build libdnf latest version in rpm-ostree

+Patch3:         libsolv-Add-support-for-modular.patch

+Patch4:         libsolv-Add-selection_make-support.patch

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -37,6 +40,8 @@ for developing applications that use libsolv.

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

+%patch3 -p1

+%patch4 -p1

 %build

 cmake \

     -DCMAKE_INSTALL_PREFIX=%{_prefix} \

@@ -69,6 +74,8 @@ make %{?_smp_mflags} test

 %{_mandir}/man3/*

 %changelog

+*   Fri Aug 14 2020 Ankit Jain <ankitja@vmware.com> 0.6.35-4

+-   Added 2 patches required to build libdnf latest version in rpm-ostree

 *   Tue Feb 25 2020 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.35-3

 -   provides pkgconfig(libsolvext).

 *   Mon Feb 03 2020 Keerthana K <keerthanak@vmware.com> 0.6.35-2

@@ -4,11 +4,12 @@ Name:           meson

 Summary:        Extremely fast and user friendly build system

 Group:          Development/Tools

 Version:        0.55.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        ASL 2.0

 URL:            https://mesonbuild.com/

 Vendor:         VMware, Inc.

 Distribution:   Photon

+Group:          Applications/System

 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz

 %define sha1    meson=86ad59c6881924bda0064000e902ac09c23e9047

 BuildArch:      noarch

@@ -23,6 +24,7 @@ BuildRequires:  gettext

 Requires:       ninja-build

 Requires:       python3

 Requires:       python3-setuptools

+Requires:       python3-gobject-introspection

 %description

 Meson is an open source build system meant to be both extremely fast,

@@ -58,6 +60,8 @@ python3 ./run_tests.py

 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy

 %changelog

+*   Sat Aug 22 2020 Ankit Jain <ankitja@vmware.com> 0.55.1-2

+-   Added python3-gobject-introspection requires

 *   Wed Aug 19 2020 Gerrit Photon <photon-checkins@vmware.com> 0.55.1-1

 -   Automatic Version Bump

 *   Wed Aug 12 2020 Susant Sahani <ssahani@vmware.com> 0.55.0-1

new file mode 100644

@@ -0,0 +1,72 @@

+Description: Remove unused LLVM and Rust build dependencies

+ Since the Javascript engine is normally part of Firefox, its build

+ system has dependencies on the LLVM and Rust toolchains. This limits

+ the number of architectures which mozjs68 can be built on.

+ .

+ It turns out, however, that neither LLVM nor Rust are used when mozjs68

+ is being built and these build dependencies are therefore not necessary.

+ .

+ This patch removes them and allows mozjs68 to be built on any architecture.

+ .

+Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959144

+Forwarded: no

+Last-Update: 2020-04-30

+

+Index: mozjs68-68.6.0/js/moz.configure

+===================================================================

+--- mozjs68-68.6.0.orig/js/moz.configure

+@@ -18,11 +18,6 @@ def building_js(build_project):

+ option(env='JS_STANDALONE', default=building_js,

+        help='Reserved for internal use')

+

+-include('../build/moz.configure/rust.configure',

+-        when='--enable-compile-environment')

+-include('../build/moz.configure/bindgen.configure',

+-        when='--enable-compile-environment')

+-

+ @depends('JS_STANDALONE')

+ def js_standalone(value):

+     if value:

+Index: mozjs68-68.6.0/moz.configure

+===================================================================

+--- mozjs68-68.6.0.orig/moz.configure

+@@ -598,36 +598,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags

+

+ check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)

+

+-

+-@depends(host_c_compiler, c_compiler, bindgen_config_paths)

+-def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths):

+-    clang = None

+-    for compiler in (host_c_compiler, c_compiler):

+-        if compiler and compiler.type == 'clang':

+-            clang = compiler.compiler

+-            break

+-        elif compiler and compiler.type == 'clang-cl':

+-            clang = os.path.join(os.path.dirname(compiler.compiler), 'clang')

+-            break

+-

+-    if not clang and bindgen_config_paths:

+-        clang = bindgen_config_paths.clang_path

+-    llvm_objdump = 'llvm-objdump'

+-    if clang:

+-        out = check_cmd_output(clang, '--print-prog-name=llvm-objdump',

+-                               onerror=lambda: None)

+-        if out:

+-            llvm_objdump = out.rstrip()

+-    return (llvm_objdump,)

+-

+-

+-llvm_objdump = check_prog('LLVM_OBJDUMP', llvm_objdump, what='llvm-objdump',

+-                          when='--enable-compile-environment',

+-                          paths=toolchain_search_path)

+-

+-add_old_configure_assignment('LLVM_OBJDUMP', llvm_objdump)

+-

+-

+ # Please do not add configure checks from here on.

+

+ # Fallthrough to autoconf-based configure

new file mode 100644

@@ -0,0 +1,14 @@

+--- a/python/mozbuild/mozbuild/frontend/emitter.py

+@@ -1195,11 +1195,6 @@ class TreeMetadataEmitter(LoggingMixin):

+                     raise SandboxValidationError('Path specified in LOCAL_INCLUDES '

+                         'is a filename, but a directory is required: %s '

+                         '(resolved to %s)' % (local_include, full_path), context)

+-            if (full_path == context.config.topsrcdir or

+-                    full_path == context.config.topobjdir):

+-                raise SandboxValidationError('Path specified in LOCAL_INCLUDES '

+-                    '(%s) resolves to the topsrcdir or topobjdir (%s), which is '

+-                    'not allowed' % (local_include, full_path), context)

+             include_obj = LocalInclude(context, local_include)

+             local_includes.append(include_obj.path.full_path)

+             yield include_obj

new file mode 100644

@@ -0,0 +1,27 @@

+--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py

+@@ -1051,24 +1051,6 @@

+

+         self.assertEqual(local_includes, expected)

+

+-    def test_local_includes_invalid(self):

+-        """Test that invalid LOCAL_INCLUDES are properly detected."""

+-        reader = self.reader('local_includes-invalid/srcdir')

+-

+-        with self.assertRaisesRegexp(

+-                SandboxValidationError,

+-                'Path specified in LOCAL_INCLUDES.*resolves to the '

+-                'topsrcdir or topobjdir'):

+-            objs = self.read_topsrcdir(reader)

+-

+-        reader = self.reader('local_includes-invalid/objdir')

+-

+-        with self.assertRaisesRegexp(

+-                SandboxValidationError,

+-                'Path specified in LOCAL_INCLUDES.*resolves to the '

+-                'topsrcdir or topobjdir'):

+-            objs = self.read_topsrcdir(reader)

+-

+     def test_local_includes_file(self):

+         """Test that a filename can't be used in LOCAL_INCLUDES."""

+         reader = self.reader('local_includes-filename')

new file mode 100644

@@ -0,0 +1,13 @@

+--- a/python/mozbuild/mozbuild/configure/__init__.py

+@@ -473,8 +473,8 @@

+             msg = 'Unknown option: %s' % without_value

+             if self._help:

+                 self._logger.warning(msg)

+-            else:

+-                raise InvalidOptionError(msg)

++            #else:

++            #    raise InvalidOptionError(msg)

+

+         # Run the execution queue

+         for func, args in self._execution_queue:

new file mode 100644

@@ -0,0 +1,95 @@

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+%global	major 68

+Summary:       Mozilla's JavaScript engine.

+Name:          mozjs

+Version:       68.11.0

+Release:       1%{?dist}