Hello community,
here is the log from the commit of package xfce4-panel-plugin-cellmodem for
openSUSE:Factory checked in at 2012-04-19 10:41:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-cellmodem (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cellmodem.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-cellmodem", Maintainer is
"xfce-maintain...@suse.de"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-cellmodem/xfce4-panel-plugin-cellmodem.changes
2011-09-23 12:51:18.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cellmodem.new/xfce4-panel-plugin-cellmodem.changes
2012-04-19 10:41:39.000000000 +0200
@@ -1,0 +2,25 @@
+Tue Apr 17 19:27:42 UTC 2012 - g...@opensuse.org
+
+- fix source URL
+- use upstream tarball instead of recompressed one
+
+-------------------------------------------------------------------
+Wed Apr 4 17:10:45 UTC 2012 - g...@opensuse.org
+
+- fix missing icon
+
+-------------------------------------------------------------------
+Tue Apr 3 16:48:06 UTC 2012 - g...@opensuse.org
+
+- added xfce4-panel-plugin-cellmodem-fix-callback-signature.patch
+ which fixes a wrong callback function signature causing crashes
+ (bxo#6747)
+
+-------------------------------------------------------------------
+Tue Apr 3 15:07:30 UTC 2012 - g...@opensuse.org
+
+- specfile cleanup
+- correct dependencies
+- split off -lang subpackage
+
+-------------------------------------------------------------------
Old:
----
xfce4-cellmodem-plugin-0.0.5.tar.bz2
New:
----
xfce4-cellmodem-plugin-0.0.5.tar.gz
xfce4-panel-plugin-cellmodem-fix-callback-signature.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-cellmodem.spec ++++++
--- /var/tmp/diff_new_pack.LwREF9/_old 2012-04-19 10:41:41.000000000 +0200
+++ /var/tmp/diff_new_pack.LwREF9/_new 2012-04-19 10:41:41.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-cellmodem
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -20,25 +20,30 @@
%define plugin_name xfce4-cellmodem-plugin
Name: xfce4-panel-plugin-cellmodem
-License: GPL-2.0+
Version: 0.0.5
-Release: 25
-Summary: Cellphone modem monitor plugin for the Xfce panel
+Release: 0
+Summary: Cellphone Modem Monitor Plugin for the Xfce Panel
+License: GPL-2.0+
+Group: System/GUI/XFCE
Url:
http://goodies.xfce.org/projects/panel-plugins/xfce4-cellmodem-plugin
-Source0: xfce4-cellmodem-plugin-0.0.5.tar.bz2
+Source0:
http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.0/%{plugin_name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM
xfce4-panel-plugin-cellmodem-cellmodem-0.0.5-fix-linking.patch
g...@opensuse.org -- Allows proper linking against libxfce4panel
Patch0: xfce4-panel-plugin-cellmodem-0.0.5-fix-linking.patch
# PATCH-FIX-UPSTREAM
xfce4-panel-plugin-cellmodem-0.0.5-fix-build-with-4.7.patch g...@opensuse.org
-- Fixes build with xfce4-panel >= 4.7
Patch1: xfce4-panel-plugin-cellmodem-0.0.5-fix-build-with-4.7.patch
-Group: System/GUI/XFCE
-BuildRequires: intltool
+# PATCH-FIX-UPSTREAM xfce4-panel-plugin-cellmodem-fix-callback-signature.patch
bxo#6747 g...@opensuse.org -- Fixes a wrong callback function signature causing
crashes
+Patch2: xfce4-panel-plugin-cellmodem-fix-callback-signature.patch
+BuildRequires: ed
BuildRequires: fdupes
-BuildRequires: pkgconfig(libxfce4panel-1.0)
+BuildRequires: intltool
+BuildRequires: pciutils-devel
+BuildRequires: xfce4-dev-tools
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libusb)
-BuildRequires: xfce4-dev-tools
-Requires: xfce4-panel >= 4.8.0
+BuildRequires: pkgconfig(libxfce4panel-1.0)
+BuildRequires: pkgconfig(libxfcegui4-1.0)
+Requires: xfce4-panel >= %{panel_version}
+Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -49,11 +54,18 @@
works with almost all cards which support an out-of-band channel for monitoring
purposes.
+%lang_package
%prep
%setup -q -n %{plugin_name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+# fix up missing icon
+ed -s panel-plugin/cellmodem.desktop.in.in 2>/dev/null <<'EOF'
+,s/^Icon=xfce-mouse/Icon=phone/
+w
+EOF
%build
xdt-autogen
@@ -62,16 +74,21 @@
%install
%make_install
+
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
-%find_lang %{plugin_name} %{name}.lang
+
+%find_lang %{plugin_name} %{name}.lang %{?no_lang_C}
+
%fdupes %{buildroot}%{_datadir}
%clean
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files
%defattr(-,root,root)
%{_libexecdir}/xfce4/panel-plugins/xfce4-cellmodem-plugin
%{_datadir}/xfce4/panel-plugins/cellmodem.desktop
+%files lang -f %{name}.lang
+
%changelog
++++++ xfce4-panel-plugin-cellmodem-fix-callback-signature.patch ++++++
--- xfce4-cellmodem-plugin-0.0.5.dfsg.orig/panel-plugin/cellmodem.c
+++ xfce4-cellmodem-plugin-0.0.5.dfsg/panel-plugin/cellmodem.c
@@ -586,7 +586,7 @@ cellmodem_t_update_monitors( cellmodem_t
*/
static void
-cellmodem_t_delete(cellmodem_t *monitor)
+cellmodem_t_delete(XfcePanelPlugin *plugin, cellmodem_t *monitor)
{
DEBUG("Destroying cellmodem object");
cellmodem_t_close_modem( monitor /*, TRUE*/ );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
