Skip to content

Commit

Permalink
Drop libxklavier
Browse files Browse the repository at this point in the history
Resolves: RHEL-38399
  • Loading branch information
jexposit authored and M4rtinK committed May 28, 2024
1 parent 9a611fd commit ce6cc95
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
3 changes: 0 additions & 3 deletions anaconda.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion widgets/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions widgets/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit ce6cc95

Please sign in to comment.