[packages/lxpanel] - updated to 0.7.0 - deleted obsolete patches - TODO
witekfl
witekfl at pld-linux.org
Wed Aug 27 13:51:30 CEST 2014
commit 0d9aa036f1aeb1d48fca0a20b44c5fc144cc6bdf
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Wed Aug 27 13:49:01 2014 +0200
- updated to 0.7.0
- deleted obsolete patches
- TODO
lxpanel-automake.patch | 11 -----------
lxpanel-werror.patch | 12 ------------
lxpanel.spec | 22 ++++++++++++----------
3 files changed, 12 insertions(+), 33 deletions(-)
---
diff --git a/lxpanel.spec b/lxpanel.spec
index 38ecdc5..774c88e 100644
--- a/lxpanel.spec
+++ b/lxpanel.spec
@@ -1,13 +1,12 @@
+# TODO: /etc/xdg/lxpanel - proper tags/flags etc.
Summary: LXPanel is a lightweight X11 desktop panel
Name: lxpanel
-Version: 0.5.12
-Release: 2
+Version: 0.7.0
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5: 30def9a0aa3c517e102295e8a7bc17fd
-Patch0: %{name}-werror.patch
-Patch1: %{name}-automake.patch
+Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.xz
+# Source0-md5: 39698de2c5eda2837607762c9f522cd0
URL: http://wiki.lxde.org/en/LXPanel
BuildRequires: autoconf
BuildRequires: automake >= 1:1.12
@@ -20,6 +19,9 @@ BuildRequires: libwnck2-devel
BuildRequires: libtool
BuildRequires: menu-cache-devel
BuildRequires: pkgconfig
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires: lxmenu-data
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -39,8 +41,6 @@ Pliki nagłówkowe biblioteki lxpanel.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%{__aclocal}
@@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/lxpanelctl.1*
%dir %{_datadir}/lxpanel
-%{_datadir}/lxpanel/profile
+##%{_datadir}/lxpanel/profile
%{_datadir}/lxpanel/ui
%dir %{_datadir}/lxpanel/images
@@ -89,8 +89,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/lxpanel/xkeyboardconfig
%{_datadir}/lxpanel/xkeyboardconfig/*.cfg
+%{_sysconfdir}/xdg/lxpanel
+
%files devel
%defattr(644,root,root,755)
%dir %{_includedir}/lxpanel
-%{_includedir}/lxpanel/plugin.h
+%{_includedir}/lxpanel/*.h
%{_pkgconfigdir}/lxpanel.pc
diff --git a/lxpanel-automake.patch b/lxpanel-automake.patch
deleted file mode 100644
index 36c1d9d..0000000
--- a/lxpanel-automake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lxpanel-0.5.10/data/Makefile.am.old 2012-06-11 16:08:05.000000000 +0200
-+++ lxpanel-0.5.10/data/Makefile.am 2012-06-11 16:08:49.000000000 +0200
-@@ -24,7 +24,7 @@ ui_in_files= \
- ui_DATA = $(ui_in_files:.glade=.ui)
-
- # Generate GtkBuilder UI files from Glade files
--%.ui: %.glade
-+.glade.ui:
- cp $< $@
- $(top_builddir)/src/xml-purge $@
-
diff --git a/lxpanel-werror.patch b/lxpanel-werror.patch
deleted file mode 100644
index 45f5018..0000000
--- a/lxpanel-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/0d9aa036f1aeb1d48fca0a20b44c5fc144cc6bdf
More information about the pld-cvs-commit
mailing list