Accepting request 695587 from GNOME:Next
Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/695587 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=75
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
Index: libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c
|
||||
===================================================================
|
||||
--- libgnomekbd-3.5.2.orig/libgnomekbd/gkbd-keyboard-config.c
|
||||
+++ libgnomekbd-3.5.2/libgnomekbd/gkbd-keyboard-config.c
|
||||
@@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
#define GROUP_SWITCHERS_GROUP "grp"
|
||||
-#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle"
|
||||
+#define DEFAULT_GROUP_SWITCH "grp:shifts_toggle"
|
||||
|
||||
const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] = "model";
|
||||
const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
|
@@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 1 17:50:33 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Split package to SLPP standard:
|
||||
+ Add sover define and set it to 8.
|
||||
+ New subpackage gnomekbd-tools.
|
||||
+ New subpackage libgnomekbd8.
|
||||
+ New subpackage typelib-1_0-Gkbd-3_0.
|
||||
+ Drop BUILD_FROM_VCS conditionals.
|
||||
+ Add post(un) handling of the new shared library package.
|
||||
+ Update URL to current GNOME gitlab home.
|
||||
- Drop libgnomekbd-default-group-switch.patch: It does not seem to
|
||||
make any noticeable change today.
|
||||
- Modernize spec, run spec-cleaner, drop post(un) handling of
|
||||
glib2_gsettings_schema_post(un) and desktop_database_post(un) and
|
||||
glib2_gsettings_schema_requires macro.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 22:37:50 UTC 2019 - bjorn.lie@gmail.com
|
||||
|
||||
|
101
libgnomekbd.spec
101
libgnomekbd.spec
@@ -16,18 +16,17 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 8
|
||||
|
||||
Name: libgnomekbd
|
||||
Version: 3.26.1
|
||||
Release: 0
|
||||
Summary: GNOME Keyboard Library
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/GUI/GNOME
|
||||
URL: http://www.gnome.org/
|
||||
Source: http://download.gnome.org/sources/libgnomekbd/3.26/%{name}-%{version}.tar.xz
|
||||
# PATCH-FEATURE-OPENSUSE libgnomekbd-default-group-switch.patch vuntz@opensuse.org -- We use shifts_toggle to switch between groups in openSUSE
|
||||
Patch0: libgnomekbd-default-group-switch.patch
|
||||
URL: https://gitlab.gnome.org/GNOME/libgnomekbd
|
||||
Source0: https://download.gnome.org/sources/libgnomekbd/3.26/%{name}-%{version}.tar.xz
|
||||
|
||||
# For %%desktop_database_* macros
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: intltool
|
||||
@@ -37,65 +36,76 @@ BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libxklavier) >= 5.2
|
||||
Recommends: %{name}-lang
|
||||
%glib2_gsettings_schema_requires
|
||||
%if 0%{?BUILD_FROM_VCS}
|
||||
BuildRequires: gnome-common
|
||||
%endif
|
||||
|
||||
%description
|
||||
GNOME keyboard library, utility and applet.
|
||||
GNOME keyboard library and utility.
|
||||
|
||||
%package -n gnomekbd-tools
|
||||
Summary: GNOME Keyboard tools
|
||||
Group: System/GUI/GNOME
|
||||
Recommends: %{name}-lang
|
||||
|
||||
%description -n gnomekbd-tools
|
||||
GNOME keyboard library and utility.
|
||||
|
||||
This package provides various binaries and conversion tools for
|
||||
libgnomekbd.
|
||||
|
||||
%package -n libgnomekbd%{sover}
|
||||
Summary: GNOME Keyboard Library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libgnomekbd%{sover}
|
||||
GNOME keyboard shared library.
|
||||
|
||||
This package provides the shared library of libgnomekbd.
|
||||
|
||||
%package -n typelib-1_0-Gkbd-3_0
|
||||
Summary: Introspection bindings for libgnomekbd
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-Gkbd-3_0
|
||||
GNOME keyboard library and utility.
|
||||
|
||||
This package provides the GObject Introspection bindings for
|
||||
libgnomekbd.
|
||||
|
||||
%package devel
|
||||
Summary: GNOME Keyboard Library
|
||||
Group: System/GUI/GNOME
|
||||
Requires: %{name} = %{version}
|
||||
Group: Development/Libraries/GNOME
|
||||
Requires: %{name}%{sover} = %{version}
|
||||
Requires: gnomekbd-tools = %{version}
|
||||
Requires: typelib-1_0-Gkbd-3_0 = %{version}
|
||||
|
||||
%description devel
|
||||
GNOME keyboard library, utility and applet.
|
||||
This package contains the header files for developing
|
||||
applications that want to make use of libgnomekbd.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup
|
||||
translation-update-upstream
|
||||
%patch0 -p1
|
||||
|
||||
%if 0%{?BUILD_FROM_VCS}
|
||||
[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
|
||||
%endif
|
||||
|
||||
%build
|
||||
%configure --disable-static --with-pic
|
||||
make %{?_smp_mflags} V=1
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-pic \
|
||||
%{nil}
|
||||
%make_build V=1
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%if 0%{?suse_version} <= 1120
|
||||
rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
|
||||
%endif
|
||||
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%find_lang %{name} %{?no_lang_C}
|
||||
%fdupes %{buildroot}
|
||||
%fdupes %{buildroot}/%{_prefix}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%glib2_gsettings_schema_post
|
||||
%desktop_database_post
|
||||
%post -n libgnomekbd%{sover} -p /sbin/ldconfig
|
||||
%postun -n libgnomekbd%{sover} -p /sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%glib2_gsettings_schema_postun
|
||||
%desktop_database_postun
|
||||
|
||||
%files
|
||||
# NEWS README are empty
|
||||
%license COPYING.LIB
|
||||
%doc AUTHORS ChangeLog ChangeLog.libgswitchit ChangeLog.libkbdraw
|
||||
%files -n gnomekbd-tools
|
||||
%{_bindir}/gkbd-keyboard-display
|
||||
%{_libdir}/*so.*
|
||||
%{_libdir}/girepository-1.0/Gkbd-3.0.typelib
|
||||
# Own the directory since we can't depend on gconf providing them
|
||||
%dir %{_datadir}/GConf
|
||||
%dir %{_datadir}/GConf/gsettings
|
||||
%{_datadir}/GConf/gsettings/libgnomekbd.convert
|
||||
@@ -105,6 +115,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.libgnomekbd.keyboard.gschema.xml
|
||||
%{_datadir}/libgnomekbd/
|
||||
|
||||
%files -n libgnomekbd%{sover}
|
||||
%license COPYING.LIB
|
||||
%{_libdir}/*so.*
|
||||
|
||||
%files -n typelib-1_0-Gkbd-3_0
|
||||
%{_libdir}/girepository-1.0/Gkbd-3.0.typelib
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
|
||||
%files devel
|
||||
|
Reference in New Issue
Block a user