Accepting request 67423 from GNOME:Next

thanks

OBS-URL: https://build.opensuse.org/request/show/67423
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=49
This commit is contained in:
Vincent Untz 2011-04-21 08:26:33 +00:00 committed by Git OBS Bridge
parent f147bcc156
commit c98797b479
5 changed files with 119 additions and 29 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256
size 410928

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:727293963847761b7942d9c5c195c317a5f5f18585ebc6d348147924242902e9
size 428490

View File

@ -1,13 +1,13 @@
Index: libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c
===================================================================
--- libgnomekbd-2.31.5.orig/libgnomekbd/gkbd-keyboard-config.c
+++ libgnomekbd-2.31.5/libgnomekbd/gkbd-keyboard-config.c
diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
index 51c6ce4..7c01781 100644
--- a/libgnomekbd/gkbd-keyboard-config.c
+++ b/libgnomekbd/gkbd-keyboard-config.c
@@ -35,7 +35,7 @@
#define GKBD_KEYBOARD_CONFIG_KEY_PREFIX GKBD_CONFIG_KEY_PREFIX "/kbd"
*/
#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_DIR[] = GKBD_KEYBOARD_CONFIG_KEY_PREFIX;
const gchar GKBD_KEYBOARD_CONFIG_KEY_MODEL[] =
#define XMODMAP_CMD "xmodmap"

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Wed Apr 6 09:08:55 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0.1:
+ Fix color of status indicator in fallback mode.
+ Fix initial size of status indicator.
-------------------------------------------------------------------
Tue Apr 5 17:26:19 UTC 2011 - fcrozat@novell.com
- Update to version 3.0.0:
+ Updated translations
- Changes from version 2.91.92:
+ Minor fixes
-------------------------------------------------------------------
Tue Mar 8 12:54:43 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.91:
+ More improvements in the drawing widget.
+ Small build/runtime fixes
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 23 15:30:15 UTC 2011 - fcrozat@novell.com
- Update to version 2.91.90:
+ A lot of improvements in the drawing widget.
+ Updated for new libxklavier 5.1.
+ Separate gkbd-keyboard-display app.
+ Updated translations
- Changes from version 2.91.5:
+ Big refactoring: common code from both indicators is separated
into GkbdConfiguration.
+ Introspection added, for embedding into JS-driven gnome-shell.
+ A number of bugs and build issues fixed.
+ Still trying to catch fast changing gtk APIs.
- Changes from version 2.91.4:
+ Fix build with latest GTK3
+ Updated translations
- enable introspection support
- Drop libgnomekbd-fix-gtk3.patch: fixed upstream.
- Change gtk2-devel Requires to gtk3-devel in devel subpackage.
- Add support for source service checkout, with %BUILD_FROM_VCS:
+ Add gnome-common BuildRequires.
+ Add call to ./autogen.sh.
-------------------------------------------------------------------
Sun Feb 13 16:47:00 CET 2011 - vuntz@opensuse.org
@ -9,6 +56,36 @@ Sun Feb 13 16:47:00 CET 2011 - vuntz@opensuse.org
- Change Requires of lang subpackage to Recommends, since the
english documentation is not there anymore.
-------------------------------------------------------------------
Fri Dec 17 10:46:39 CET 2010 - vuntz@opensuse.org
- Update to version 2.91.3.1:
+ Fix build with GTK3.
- Changes from version 2.91.3:
+ More changes related to GTK3.
+ Eliminated one crasher
+ Updated translations.
- Changes from version 2.91.2:
+ Further changes related to GTK3.
+ Simple xmodmap support introduced (moved from
gnome-settings-daemon).
+ I18N fixed.
+ Updated translations.
- Changes from version 2.91.1:
+ Changed API - from gconf to gsettings.
+ Ported to GTK3
- Remove gconf2-devel, gtk2-devel BuildRequires.
- Move to pkgconfig()-style BuildRequires:
+ Old ones: libxklavier-devel
+ New ones: glib-2.0, libxklavier.
- Add pkgconfig(gtk+-3.0) BuildRequires.
- Rebase libgnomekbd-default-group-switch.patch.
- Add libgnomekbd-fix-gtk3.patch to fix build with GTK+ 2.91.6.
- Remove all the gconf schema handling (%gconf_schemas_prereq,
%find_gconf_schemas and scriptlets).
- Handle gsettings schemas: add %glib2_gsettings_schema_requires
and %glib2_gsettings_schema_post(un) in the scriptlets.
-------------------------------------------------------------------
Tue Sep 28 00:40:12 CEST 2010 - vuntz@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package libgnomekbd (Version 2.32.0)
# spec file for package libgnomekbd
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: libgnomekbd
Version: 2.32.0
Version: 3.0.0.1
Release: 1
License: LGPLv2.1+
Summary: GNOME Keyboard Library
@ -28,15 +28,19 @@ Source: %{name}-%{version}.tar.bz2
# 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
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libxklavier-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
%if 0%{?BUILD_FROM_VCS}
BuildRequires: gnome-common
%endif
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libxklavier)
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%glib2_gsettings_schema_requires
%description
GNOME keyboard library, utility and applet.
@ -48,7 +52,7 @@ Group: System/GUI/GNOME
Requires: %{name} = %{version}
Requires: dbus-1-glib-devel
Requires: gconf2-devel
Requires: gtk2-devel
Requires: gtk3-devel
Requires: libxklavier-devel
%description devel
@ -60,9 +64,13 @@ GNOME keyboard library, utility and applet.
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} %{?jobs:-j%jobs}
%{__make} %{?jobs:-j%jobs} V=1
%install
%makeinstall
@ -72,42 +80,47 @@ translation-update-upstream
%{__rm} -f %{buildroot}%{_libdir}/*.la
%suse_update_desktop_file gkbd-indicator-plugins-capplet
%find_lang %{name} %{?no_lang_C}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
%fdupes %{buildroot}
%clean
rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
%post
/sbin/ldconfig
%glib2_gsettings_schema_post
%desktop_database_post
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun
/sbin/ldconfig
%glib2_gsettings_schema_postun
%desktop_database_postun
%files -f %{name}.lst
%files
%defattr(-, root, root)
# NEWS README are empty
%doc AUTHORS COPYING.LIB ChangeLog ChangeLog.libgswitchit ChangeLog.libkbdraw
%{_bindir}/gkbd-keyboard-display
%{_bindir}/gkbd-indicator-plugins-capplet
%{_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
%{_datadir}/applications/gkbd-indicator-plugins-capplet.desktop
%{_datadir}/applications/gkbd-keyboard-display.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.libgnomekbd.desktop.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.libgnomekbd.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.libgnomekbd.keyboard.gschema.xml
%{_datadir}/libgnomekbd/
%files lang -f %{name}.lang
%files devel
%defattr(-, root, root)
%{_includedir}/libgnomekbd
%{_includedir}/libgnomekbd/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gir-1.0/Gkbd-3.0.gir
%changelog