rpms/xfce4-xkb-plugin/F-10 xxp-0.5.2-xklavier-api.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xfce4-xkb-plugin.spec, 1.17, 1.18

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24009

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Added Files:
	xxp-0.5.2-xklavier-api.patch 
Log Message:
* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
- Update to 0.5.3.3 (#502878)


xxp-0.5.2-xklavier-api.patch:
 xkb-config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xxp-0.5.2-xklavier-api.patch ---
diff -up xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c.jx	2008-11-10 04:06:31.000000000 -0500
+++ xfce4-xkb-plugin-0.5.2/panel-plugin/xkb-config.c	2009-07-07 15:42:40.000000000 -0400
@@ -153,7 +153,7 @@ xkb_config_initialize_xkb_options (t_xkb
     config->application_map = g_hash_table_new (g_direct_hash, NULL);
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
     
     config_item = xkl_config_item_new ();
 
@@ -529,7 +529,7 @@ xkb_config_get_xkl_registry ()
     if (!config) return NULL;
 
     registry = xkl_config_registry_get_instance (config->engine);
-    xkl_config_registry_load (registry);
+    xkl_config_registry_load (registry, FALSE);
 
     return registry;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Nov 2008 01:11:53 -0000	1.10
+++ .cvsignore	9 Aug 2009 00:30:03 -0000	1.11
@@ -1 +1 @@
-xfce4-xkb-plugin-0.5.2.tar.gz
+xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Nov 2008 01:11:53 -0000	1.10
+++ sources	9 Aug 2009 00:30:03 -0000	1.11
@@ -1 +1 @@
-c10bf6f8809a1722354cd91db8987fd3  xfce4-xkb-plugin-0.5.2.tar.gz
+b233cc9de1cbace075eaf6e2c9a8e685  xfce4-xkb-plugin-0.5.3.3.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-xkb-plugin/F-10/xfce4-xkb-plugin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- xfce4-xkb-plugin.spec	28 Nov 2008 01:11:53 -0000	1.17
+++ xfce4-xkb-plugin.spec	9 Aug 2009 00:30:03 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		xfce4-xkb-plugin
-Version:	0.5.2
+Version:	0.5.3.3
 Release:	1%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
@@ -11,9 +11,11 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.90.2, libxml2-devel
 BuildRequires:	libxklavier-devel >= 3.2, librsvg2-devel >= 2.18, libwnck-devel >= 2.12
-BuildRequires:	gettext, perl(XML::Parser)
+BuildRequires:	gettext, intltool
 Requires:	xfce4-panel >= 4.4.0
 
+Patch0:		xxp-0.5.2-xklavier-api.patch
+
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
 keyboard layout, and refreshes when layout changes. The layout can be 
@@ -23,6 +25,9 @@ XF86Config file or some other way (e.g. 
 
 %prep
 %setup -q
+%if 0%{?fedora} >= 12
+%patch0 -p1 -b .api
+%endif
 
 %build
 %configure --disable-static
@@ -30,7 +35,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
 
 %clean
@@ -46,6 +51,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/xkb/flags/*.svg
 
 %changelog
+* Sun Aug 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.3.3-1
+- Update to 0.5.3.3 (#502878)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 0.5.2-4
+- xxp-0.5.2-xklavier-api.patch: Fix for new libxklavier API.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-2
+- Rebuild for Xfce 4.6 (Beta 3)
+
 * Thu Nov 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-1
 - Update to 0.5.2