[packages/lxpanel] - updated to 0.5.12 (removed obsolete AM_PROG_AR.patch, added werror.patch to fix build with -Werr

[hawk]

commit c8ce7abad6674773d3d5cc5b1c9f4de9dd554c4c
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Thu Jul 18 09:16:06 2013 +0000

    - updated to 0.5.12 (removed obsolete AM_PROG_AR.patch, added werror.patch
      to fix build with -Werror=format-security)

 lxpanel-AM_PROG_AR.patch | 10 ----------
 lxpanel-werror.patch     | 12 ++++++++++++
 lxpanel.spec             | 10 +++++++---
 3 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/lxpanel.spec b/lxpanel.spec
index e7e4db1..6291890 100644
--- a/lxpanel.spec
+++ b/lxpanel.spec
@@ -1,12 +1,12 @@
 Summary:	LXPanel is a lightweight X11 desktop panel
 Name:		lxpanel
-Version:	0.5.10
+Version:	0.5.12
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5:	1bf3cce2a2d01c211f6897c42e8dd0bc
-Patch0:		%{name}-AM_PROG_AR.patch
+# Source0-md5:	30def9a0aa3c517e102295e8a7bc17fd
+Patch0:		%{name}-werror.patch
 Patch1:		%{name}-automake.patch
 URL:		http://wiki.lxde.org/en/LXPanel
 BuildRequires:	autoconf
@@ -76,6 +76,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/lxpanelctl.1*
 
 %dir %{_datadir}/lxpanel
+%{_datadir}/lxpanel/xkeyboardconfig/*.cfg
 %{_datadir}/lxpanel/profile
 %{_datadir}/lxpanel/ui
 
@@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 # TODO: lang tags here
 %{_datadir}/lxpanel/images/xkb-flags/*.png
 
+%dir %{_datadir}/lxpanel/xkeyboardconfig
+%{_datadir}/lxpanel/xkeyboardconfig/*.cfg
+
 %files devel
 %defattr(644,root,root,755)
 %dir %{_includedir}/lxpanel
diff --git a/lxpanel-AM_PROG_AR.patch b/lxpanel-AM_PROG_AR.patch
deleted file mode 100644
index b9d0f60..0000000
--- a/lxpanel-AM_PROG_AR.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lxpanel-0.5.10/configure.ac.old	2012-06-11 15:58:07.000000000 +0200
-+++ lxpanel-0.5.10/configure.ac	2012-06-11 15:58:29.000000000 +0200
-@@ -16,6 +16,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_INTLTOOL(, [no-xml])
- AM_PROG_CC_C_O
-+AM_PROG_AR
- 
- #Initialize libtool
- LT_PREREQ([2.2])
diff --git a/lxpanel-werror.patch b/lxpanel-werror.patch
new file mode 100644
index 0000000..45f5018
--- /dev/null
+++ b/lxpanel-werror.patch
@@ -0,0 +1,12 @@
+diff -ur lxpanel-0.5.12.orig/src/plugins/netstatus/netstatus-iface.c lxpanel-0.5.12.fix/src/plugins/netstatus/netstatus-iface.c
+--- lxpanel-0.5.12.orig/src/plugins/netstatus/netstatus-iface.c	2012-11-03 03:10:08.000000000 +0000
++++ lxpanel-0.5.12.fix/src/plugins/netstatus/netstatus-iface.c	2013-07-18 08:56:22.016116247 +0000
+@@ -408,7 +408,7 @@
+   va_start (args, format);
+ 
+   error_message = g_strdup_vprintf (format, args);
+-  error = g_error_new (NETSTATUS_ERROR, code, error_message);
++  error = g_error_new (NETSTATUS_ERROR, code, "%s", error_message);
+ 
+   dprintf (POLLING, "ERROR: %s\n", error->message);
+   netstatus_iface_set_error (iface, error);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxpanel.git/commitdiff/c8ce7abad6674773d3d5cc5b1c9f4de9dd554c4c