[jhbuild] 3.26: Disable RPM support in appstream-glib and gnome-software

[Ting-Wei Lan <lantw src gnome org>]

commit ff4f9785df94cd7c5daad18bbe132b5eb7a8e391
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Thu Jun 8 23:07:08 2017 +0800

    3.26: Disable RPM support in appstream-glib and gnome-software
    
    Unconditionally enable RPM support causes meson to fail on non-RPM distributions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783461

 modulesets/gnome-suites-core-3.26.modules      |    2 +-
 modulesets/gnome-suites-core-deps-3.26.modules |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.26.modules b/modulesets/gnome-suites-core-3.26.modules
index c0d2678..2255086 100644
--- a/modulesets/gnome-suites-core-3.26.modules
+++ b/modulesets/gnome-suites-core-3.26.modules
@@ -980,7 +980,7 @@
     </dependencies>
   </meson>
 
-  <meson id="gnome-software">
+  <meson id="gnome-software" mesonargs="-Denable-rpm=false">
     <if condition-unset="linux">
       <mesonargs value="-Denable-ostree=false -Denable-firmware=false -Denable-flatpak=false 
-Denable-gudev=false"/>
     </if>
diff --git a/modulesets/gnome-suites-core-deps-3.26.modules b/modulesets/gnome-suites-core-deps-3.26.modules
index fd266f9..870cf37 100644
--- a/modulesets/gnome-suites-core-deps-3.26.modules
+++ b/modulesets/gnome-suites-core-deps-3.26.modules
@@ -75,7 +75,7 @@
 
 <!-- Please try to keep organized alphabetically -->
 
-  <meson id="appstream-glib" mesonargs="-Denable-stemmer=false">
+  <meson id="appstream-glib" mesonargs="-Denable-stemmer=false -Denable-rpm=false">
     <branch repo="github.com" module="hughsie/appstream-glib.git"/>
     <dependencies>
       <dep package="freetype2"/>