[gnome-nettool/f14/master] 2.31.6

[Matthias Clasen]

commit 3c4ed4cb2ded9c845248ebe98e14a7dd84a03f63
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Aug 19 20:43:56 2010 -0400

    2.31.6

 .gitignore         |    1 +
 gnome-nettool.spec |   27 ++++++++-------------------
 sources            |    2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a691dd5..d0e3da0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnome-nettool-2.28.0.tar.bz2
+/gnome-nettool-2.31.6.tar.bz2
diff --git a/gnome-nettool.spec b/gnome-nettool.spec
index b17c4eb..06ee048 100644
--- a/gnome-nettool.spec
+++ b/gnome-nettool.spec
@@ -1,22 +1,15 @@
-%define gtk2_version 2.4.0
-%define libglade2_version 2.3.6
-%define gconf2_version 2.6.0
-%define libgnomeui_version 2.6.0
 
 Summary: Network information tool for GNOME
 Name: gnome-nettool
-Version: 2.28.0
+Version: 2.31.6
 Release: 1%{?dist}
 URL: http://projects.gnome.org/gnome-network/
-Source0: http://download.gnome.org/sources/gnome-nettool/2.28/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-nettool/2.31/%{name}-%{version}.tar.bz2
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%({__id_u} -n)
 
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: GConf2-devel >= %{gconf2_version}
-BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
+BuildRequires: gtk3-devel
+BuildRequires: GConf2-devel
 BuildRequires: libgtop2-devel
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -35,12 +28,10 @@ tools, like ping, netstat, ifconfig, whois, traceroute, finger.
 %setup -q
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --with-gtk=3.0
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 
 desktop-file-install --vendor gnome --delete-original                   \
@@ -51,8 +42,6 @@ desktop-file-install --vendor gnome --delete-original                   \
   --add-category Utility                                                \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-nettool.desktop
 
-rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-
 %find_lang %{name} --with-gnome
 
 %post
@@ -70,9 +59,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
@@ -84,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Aug 19 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.6-1
+- Update to 2.31.6
+
 * Fri Dec  4 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0-1
 - Update to 2.28.0
 
diff --git a/sources b/sources
index a2f3dba..74fc205 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5d44454cfa4c5ca5e640c304f18fe0e  gnome-nettool-2.28.0.tar.bz2
+1a47492434e1fe22735ca1da617bf195  gnome-nettool-2.31.6.tar.bz2