commit etherape for openSUSE:Factory
Hello community, here is the log from the commit of package etherape for openSUSE:Factory checked in at Fri Jan 7 13:57:33 CET 2011. -------- --- etherape/etherape.changes 2010-02-28 18:55:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/etherape/etherape.changes 2011-01-04 18:54:22.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 4 17:55:42 UTC 2011 - malcolmlewis@opensuse.org + +- Update desktop patch +- Add optflags to fix gcc warning +- Disable scrollkeeper +- Spec file tidy up + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- etherape-0.9.7-desktop.patch New: ---- etherape-0.9.9-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etherape.spec ++++++ --- /var/tmp/diff_new_pack.xAzHTM/_old 2011-01-07 13:56:48.000000000 +0100 +++ /var/tmp/diff_new_pack.xAzHTM/_new 2011-01-07 13:56:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package etherape (Version 0.9.9) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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,16 +20,23 @@ Name: etherape Url: http://etherape.sourceforge.net/ -BuildRequires: docbook_4 fdupes gnome-doc-utils-devel libglade2-devel libgnomeui-devel libpcap-devel pkgconfig scrollkeeper update-desktop-files License: GPLv2+ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: A Graphical Network Monitor Version: 0.9.9 -Release: 1 +Release: 6 Source0: http://prdownloads.sourceforge.net/etherape/%{name}-%{version}.tar.bz2 -Patch0: etherape-0.9.7-desktop.patch +Patch0: etherape-0.9.9-desktop.patch Patch1: etherape-0.9.9-sequence_point.patch +BuildRequires: docbook_4 +BuildRequires: fdupes +BuildRequires: gnome-doc-utils-devel +BuildRequires: libglade2-devel +BuildRequires: libgnomeui-devel +BuildRequires: libpcap-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,25 +47,32 @@ FDDI, token ring, ISDN, PPP, and SLIP devices. It can filter traffic to show and can read traffic from a file as well as live from the network. - - %prep %setup -q -%patch0 -p1 +%patch0 %patch1 %__sed -ie "s#http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd#file:///usr/share/s..." doc/C/etherape.xml %build -%configure --with-pic -%__make %{?_smp_mflags} +# Fix likely to break with new gcc strict-aliasing-punning warning +export CFLAGS="%{optflags} -fno-strict-aliasing" + +%configure \ + --with-pic \ + --disable-scrollkeeper \ + +%__make %{?jobs:-j%jobs} %check %__make check %install -%__make install DESTDIR=%{buildroot} +%{makeinstall} + %suse_update_desktop_file %{name} System Network + %find_lang %{name} + %fdupes %{buildroot} %clean @@ -73,8 +87,6 @@ %{_datadir}/applications/etherape.desktop %{_datadir}/etherape %{_mandir}/man1/etherape.1* -%{_datadir}/omf/etherape %{_datadir}/pixmaps/etherape.png -%exclude %{_localstatedir}/lib/scrollkeeper %changelog ++++++ etherape-0.9.7-desktop.patch -> etherape-0.9.9-desktop.patch ++++++ --- etherape/etherape-0.9.7-desktop.patch 2009-11-16 15:30:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/etherape/etherape-0.9.9-desktop.patch 2011-01-04 18:54:21.000000000 +0100 @@ -1,20 +1,34 @@ -Index: etherape-0.9.7/etherape.desktop -=================================================================== ---- etherape-0.9.7.orig/etherape.desktop -+++ etherape-0.9.7/etherape.desktop -@@ -8,3 +8,5 @@ Terminal=false +--- etherape.desktop 2010-01-04 05:28:21.000000000 -0600 ++++ etherape.desktop.orig 2011-01-04 11:40:15.000000000 -0600 +@@ -2,10 +2,13 @@ + Version=1.0 + Encoding=UTF-8 + Name=EtherApe ++GenericName=EtherApe + Comment=Graphical Network Monitor + Comment[es]=Monitor Gráfico de Red + Exec=etherape + Terminal=false Type=Application - Icon=etherape.png +-Icon=etherape.png ++Icon=etherape Categories=GNOME;System;Network; +X-KDE-SubstituteUID=true +X-KDE-Username=root -Index: etherape-0.9.7/etherape.desktop.in -=================================================================== ---- etherape-0.9.7.orig/etherape.desktop.in -+++ etherape-0.9.7/etherape.desktop.in -@@ -8,3 +8,5 @@ Terminal=false +--- etherape.desktop.in 2009-10-03 03:51:15.000000000 -0500 ++++ etherape.desktop.in.orig 2011-01-04 11:39:38.000000000 -0600 +@@ -2,10 +2,13 @@ + Version=1.0 + Encoding=UTF-8 + Name=EtherApe ++GenericName=EtherApe + Comment=Graphical Network Monitor + Comment[es]=Monitor Gráfico de Red + Exec=etherape + Terminal=false Type=Application - Icon=etherape.png +-Icon=etherape.png ++Icon=etherape Categories=GNOME;System;Network; +X-KDE-SubstituteUID=true +X-KDE-Username=root ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de