rpms/lxpanel/devel lxpanel-0.3.8.1-system-config-network.patch, NONE, 1.1 lxpanel-default.patch, 1.5, 1.6 lxpanel.spec, 1.17, 1.18

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxpanel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8498

Modified Files:
	lxpanel-default.patch lxpanel.spec 
Added Files:
	lxpanel-0.3.8.1-system-config-network.patch 
Log Message:
* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.3.999-1
- Update to 0.4.0 Beta 2
- Build alsa mixer plugin
- BR wireless-tools-devel


lxpanel-0.3.8.1-system-config-network.patch:

--- NEW FILE lxpanel-0.3.8.1-system-config-network.patch ---
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus.c	2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus.c	2009-01-06 06:28:35.000000000 +0100
@@ -125,7 +125,7 @@
     else
     {
         ns->iface = g_strdup("eth0");
-        ns->config_tool = g_strdup("network-admin --configure %i");
+        ns->config_tool = g_strdup("system-config-network");
     }
 
     iface = netstatus_iface_new(ns->iface);
diff -dur lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c
--- lxpanel-0.3.8.1.orig/src/plugins/netstatus/netstatus-dialog.c	2008-04-20 10:44:13.000000000 +0200
+++ lxpanel-0.3.8.1/src/plugins/netstatus/netstatus-dialog.c	2009-01-06 06:28:35.000000000 +0100
@@ -42,7 +42,7 @@
 
 #if 0 /* stripped-down version does nothing to configurators. */
 static const char *network_config_tools[] = {
-  "network-admin --configure %i",
+  "system-config-network",
   "redhat-config-network",
   "system-control-network"
 };

lxpanel-default.patch:

Index: lxpanel-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel-default.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lxpanel-default.patch	1 Nov 2008 04:16:39 -0000	1.5
+++ lxpanel-default.patch	22 Mar 2009 21:07:35 -0000	1.6
@@ -1,15 +1,7 @@
 diff -up lxpanel-0.3.8.1/data/default/panels/panel.in.orig lxpanel-0.3.8.1/data/default/panels/panel.in
 --- lxpanel-0.3.8.1/data/default/panels/panel.in.orig	2008-08-28 21:19:43.000000000 +0200
 +++ lxpanel-0.3.8.1/data/default/panels/panel.in	2008-08-28 21:20:00.000000000 +0200
-@@ -35,6 +35,7 @@
-         separator {
-         }
-         item {
-+            image=gnome-run
-             command=run
-         }
-         separator {
-@@ -50,13 +51,10 @@ Plugin {
+@@ -50,13 +50,10 @@ Plugin {
      type = launchbar
      Config {
          Button {
@@ -24,3 +16,13 @@
          }
      }
  }
+@@ -113,10 +110,6 @@
+ }
+ 
+ Plugin {
+-    type = netstat
+-}
+-
+-Plugin {
+     type = cpu
+ }


Index: lxpanel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxpanel/devel/lxpanel.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lxpanel.spec	25 Feb 2009 22:20:12 -0000	1.17
+++ lxpanel.spec	22 Mar 2009 21:07:35 -0000	1.18
@@ -4,40 +4,55 @@
 #define _default_patch_fuzz 0
 
 Name:           lxpanel
-Version:        0.3.8.1
-Release:        4%{?dist}
+Version:        0.3.999
+Release:        1%{?dist}
 Summary:        A lightweight X11 desktop panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-Source1:        gnome-run.png
 Patch1:         lxpanel-default.patch
 Patch2:         lxpanel-0.2.8-manpage.patch
-# Posted on LXDE mailing list by Jürgen Hötzel, see
-# http://sourceforge.net/mailarchive/forum.php?thread_name=20081026205556.GA20553%40p15200770.pureserver.info&forum_name=lxde-list
-Patch3:         lxpanel-battery-callback.patch
+Patch3:         lxpanel-0.3.8.1-system-config-network.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  docbook-utils
+#BuildRequires:  docbook-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel 
 BuildRequires:  intltool
-BuildRequires:  libXmu-devel
+#BuildRequires:  libXmu-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  startup-notification-devel
+# required for alsa mixer plugin
+BuildRequires:  alsa-lib-devel
+# required for netstatus plugin
+BuildRequires:  wireless-tools-devel
+BuildRequires:  menu-cache-devel
 
 %description
 lxpanel is a lightweight X11 desktop panel. It works with any ICCCM / NETWM 
 compliant window manager (eg sawfish, metacity, xfwm4, kwin) and features a 
 tasklist, pager, launchbar, clock, menu and sytray.
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel 
+Requires:       libXpm-devel
+#Requires:       libXmu-devel
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .default
 %patch2 -p1 -b .manpage
-%patch3 -p0 -b .callback
+%patch3 -p1 -b .system-config-network
 
 %build
 %configure
@@ -50,8 +65,6 @@
 
 %find_lang %{name}
 
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/images/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,7 +77,17 @@
 %{_libdir}/lxpanel/
 %{_mandir}/man1/lxpanel*
 
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/lxpanel/
+%{_libdir}/pkgconfig/lxpanel.pc
+
 %changelog
+* Sun Mar 22 2009 Christoph Wickert <cwickert at fedoraproject.org> 0.3.999-1
+- Update to 0.4.0 Beta 2
+- Build alsa mixer plugin
+- BR wireless-tools-devel
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild