Merge pull request #5293 from yselkowitz/disable-glade

widgets: disable glade in RHEL builds
rhinstaller · Nov 8, 2023 · 9a42c32 · 9a42c32
2 parents 0eec752 + 95fe739
commit 9a42c32
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/anaconda.spec.in b/anaconda.spec.in
@@ -16,9 +16,11 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 # match the requires versions of things).
 
 %if ! 0%{?rhel}
+%bcond_without glade
 %bcond_without live
 %define blivetguiver 2.4.2-3
 %else
+%bcond_with glade
 %bcond_with live
 %endif
 %define cockpitver 275
@@ -55,7 +57,9 @@ BuildRequires: gtk-doc
 BuildRequires: gtk3-devel-docs >= %{gtk3ver}
 BuildRequires: glib2-doc
 BuildRequires: gobject-introspection-devel
+%if %{with glade}
 BuildRequires: glade-devel
+%endif
 BuildRequires: libgnomekbd-devel
 BuildRequires: libxklavier-devel >= %{libxklavierver}
 BuildRequires: make
@@ -325,7 +329,9 @@ installer.
 
 %package widgets-devel
 Summary: Development files for anaconda-widgets
+%if %{with glade}
 Requires: glade
+%endif
 Requires: %{name}-widgets%{?_isa} = %{version}-%{release}
 
 %description widgets-devel
@@ -351,7 +357,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %build
 # use actual build-time release number, not tarball creation time release number
-%configure ANACONDA_RELEASE=%{release}
+%configure ANACONDA_RELEASE=%{release} %{!?with_glade:--disable-glade}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -487,10 +493,12 @@ rm -rf \
 %{python3_sitearch}/gi/overrides/*
 
 %files widgets-devel
+%{_includedir}/*
 %{_libdir}/libAnacondaWidgets.so
+%if %{with glade}
 %{_libdir}/glade/modules/libAnacondaWidgets.so
-%{_includedir}/*
 %{_datadir}/glade/catalogs/AnacondaWidgets.xml
+%endif
 %{_datadir}/gtk-doc
 
 %files dracut

diff --git a/widgets/Makefile.am b/widgets/Makefile.am
@@ -19,7 +19,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src python glade doc
+SUBDIRS = src python @GLADE_SUBDIR@ doc
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in config.sub \
 	configure depcomp install-sh ltmain.sh missing py-compile \

diff --git a/widgets/configure.ac b/widgets/configure.ac
@@ -62,7 +62,14 @@ AC_ARG_WITH([html-dir],
 HTML_DIR="$with_html_dir"
 AC_SUBST([HTML_DIR])
 
-ANACONDA_PKG_CHECK_MODULES([GLADEUI], [gladeui-2.0 >= 3.10])
+AC_ARG_ENABLE([glade],
+              AS_HELP_STRING([--disable-glade], [Build without glade module]))
+
+AS_IF([test "x$enable_glade" != "xno"],
+      [ANACONDA_PKG_CHECK_MODULES([GLADEUI], [gladeui-2.0 >= 3.10])
+       AC_SUBST(GLADE_SUBDIR, "glade")],
+      [AC_SUBST(GLADE_SUBDIR, "")])
+
 ANACONDA_PKG_CHECK_MODULES([GTK], [gtk+-x11-3.0 >= 3.11.3])
 ANACONDA_PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier >= 5.2.1])
 ANACONDA_PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 1.30])