[jhbuild/docbook5_fedora] sysdeps: docbook-xsl is docbook-style-xsl in Fedora




commit 64cb3150098c0b8fa5f9b70cf0431a27bb366ad1
Author: Nelson Benítez León <nbenitezl gmail com>
Date:   Fri Mar 5 22:10:58 2021 -0400

    sysdeps: docbook-xsl is docbook-style-xsl in Fedora
    
    Update 'gtk-doc' and 'libnotify' modules to use
    the more precise name dep so the user is reported
    the correct package name to install.
    
    Issue #65

 jhbuild/commands/sanitycheck.py                  |  2 +-
 modulesets/gnome-suites-core-deps-latest.modules | 14 ++++++++++++--
 modulesets/gnome-sysdeps-latest.modules          |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/commands/sanitycheck.py b/jhbuild/commands/sanitycheck.py
index 454c928b..37a84c9a 100644
--- a/jhbuild/commands/sanitycheck.py
+++ b/jhbuild/commands/sanitycheck.py
@@ -96,7 +96,7 @@ class cmd_sanitycheck(Command):
                 try:
                     get_output(['xmlcatalog', '/etc/xml/catalog', item])
                 except CommandError:
-                    uprint(_('Could not find %s in XML catalog (usually part of package \'docbook-xsl\')') % 
name)
+                    uprint(_('Could not find %s in XML catalog (usually part of package \'docbook-xsl\' or 
\'docbook5-style-xsl\')') % name)
 
         # Perl module used by tools such as intltool:
         perlmod = 'XML::Parser'
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index c783bb6b..0b5eb288 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1011,7 +1011,12 @@
       <dep package="libtool"/>
       <dep package="gettext"/>
       <dep package="docbook-xml"/>
-      <dep package="docbook-xsl"/>
+      <if condition-set="fedora">
+        <dep package="docbook5-style-xsl"/>
+      </if>
+      <if condition-unset="fedora">
+        <dep package="docbook-xsl"/>
+      </if>
       <dep package="python3-pygments"/>
       <dep package="python3-devel"/>
       <dep package="cc"/>
@@ -1511,7 +1516,12 @@
       <dep package="glib"/>
       <dep package="gtk+-3"/>
       <dep package="gobject-introspection"/>
-      <dep package="docbook-xsl"/>
+      <if condition-set="fedora">
+        <dep package="docbook5-style-xsl"/>
+      </if>
+      <if condition-unset="fedora">
+        <dep package="docbook-xsl"/>
+      </if>
       <dep package="docbook-xml"/>
       <dep package="xsltproc"/>
     </dependencies>
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 6b38f6c3..4ece2f95 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -209,6 +209,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="docbook5-style-xsl"> <!-- Fedora package name -->
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="xml" name="http://docbook.sourceforge.net/release/xsl/current/"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="dotconf">
     <pkg-config>dotconf.pc</pkg-config>
     <branch repo="system" version="1.3"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]