diff --git a/.packit.yml b/.packit.yml index 03d80eb0824..602706c98f7 100644 --- a/.packit.yml +++ b/.packit.yml @@ -20,7 +20,6 @@ srpm_build_deps: - python3-polib - gobject-introspection-devel - glade-devel - - libxklavier-devel - libarchive-devel - rpm-devel - nss_wrapper diff --git a/.packit.yml.j2 b/.packit.yml.j2 index 2bcd4b83fb4..6d4151d53f0 100644 --- a/.packit.yml.j2 +++ b/.packit.yml.j2 @@ -13,7 +13,11 @@ srpm_build_deps: - python3-polib - gobject-introspection-devel - glade-devel +{% if distro_name == "fedora" %} - libxklavier-devel +{% elif distro_name == "rhel" and distro_release < 10 %} + - libxklavier-devel +{% endif %} - libarchive-devel - rpm-devel - nss_wrapper diff --git a/anaconda.spec.in b/anaconda.spec.in index 12d57f351bd..7384089e1f3 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -35,7 +35,6 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers %define libarchivever 3.0.4 %define libblockdevver 2.1 %define libreportanacondaver 2.0.21-1 -%define libxklavierver 5.4 %define mehver 0.23-1 %define nmver 1.0 %define pykickstartver 3.52-1 @@ -57,7 +56,6 @@ BuildRequires: gobject-introspection-devel %if %{with glade} BuildRequires: glade-devel %endif -BuildRequires: libxklavier-devel >= %{libxklavierver} BuildRequires: make BuildRequires: pango-devel BuildRequires: python3-devel @@ -284,7 +282,6 @@ Requires: python3-xkbregistry Requires: adwaita-icon-theme Requires: tecla Requires: tigervnc-server-minimal -Requires: libxklavier >= %{libxklavierver} Requires: nm-connection-editor %ifnarch s390 s390x Requires: NetworkManager-wifi diff --git a/widgets/configure.ac b/widgets/configure.ac index 4d3ecaf88c4..3f8f0bc1123 100644 --- a/widgets/configure.ac +++ b/widgets/configure.ac @@ -72,7 +72,6 @@ AS_IF([test "x$enable_glade" != "xno"], [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]) # Use AM_PATH_GLIB_2_0 to define some extra glib-related variables diff --git a/widgets/src/Makefile.am b/widgets/src/Makefile.am index e87dc5a4cb1..34fd0d4a5a2 100644 --- a/widgets/src/Makefile.am +++ b/widgets/src/Makefile.am @@ -60,9 +60,9 @@ WIDGETSDATA = '"$(datadir)/anaconda"' noinst_HEADERS = gettext.h intl.h lib_LTLIBRARIES = libAnacondaWidgets.la -libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) $(LIBXKLAVIER_CFLAGS) -Wall -g\ +libAnacondaWidgets_la_CFLAGS = $(GTK_CFLAGS) -Wall -g\ -DWIDGETS_DATADIR=$(WIDGETSDATA) -libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) $(LIBXKLAVIER_LIBS) +libAnacondaWidgets_la_LIBADD = $(GTK_LIBS) libAnacondaWidgets_la_LDFLAGS = $(LTLIBINTL) -version-info 4:0:0 libAnacondaWidgets_la_SOURCES = $(SOURCES) $(HDRS) @@ -124,7 +124,7 @@ AnacondaWidgets-3.4.gir: libAnacondaWidgets.la AnacondaWidgets_3_4_gir_FILES = $(GISOURCES) $(GIHDRS) AnacondaWidgets_3_4_gir_LIBS = libAnacondaWidgets.la AnacondaWidgets_3_4_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Anaconda --symbol-prefix=anaconda -AnacondaWidgets_3_4_gir_INCLUDES = Gtk-3.0 Xkl-1.0 +AnacondaWidgets_3_4_gir_INCLUDES = Gtk-3.0 INTROSPECTION_GIRS = AnacondaWidgets-3.4.gir