- updated to 0.9.4; some patchs fixed

- STBR

Changed files:
    etherape-Makefile.patch -> 1.1
    etherape-resolv.patch -> 1.4
    etherape.spec -> 1.61

diff --git a/etherape-Makefile.patch b/etherape-Makefile.patch
new file mode 100644 (file)
index 0000000..4132488
--- /dev/null
+++ b/etherape-Makefile.patch
@@ -0,0 +1,11 @@
+--- etherape-0.9.4/po/Makefile.in.in.orig      2006-02-01 12:43:52.000000000 +0100
++++ etherape-0.9.4/po/Makefile.in.in   2006-02-01 12:44:45.000000000 +0100
+@@ -27,7 +27,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(MKINSTALLDIRS)" ;; esac`
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@

diff --git a/etherape-resolv.patch b/etherape-resolv.patch
index 157648757803aa3e5bd321787515d8d523632595..bfc6bf5c7595d25501a10fab3b859c9c3d38d82c 100644 (file)
--- a/etherape-resolv.patch
+++ b/etherape-resolv.patch
@@ -1,36 +1,36 @@
---- etherape-0.9.0/configure.in.orig   2003-03-01 23:05:30.000000000 +0100
-+++ etherape-0.9.0/configure.in        2004-07-14 21:21:22.064405638 +0200
-@@ -45,14 +45,25 @@
+--- etherape-0.9.4/configure.in.orig   2006-01-11 07:47:42.000000000 +0100
++++ etherape-0.9.4/configure.in        2006-02-01 12:23:25.000000000 +0100
+@@ -90,14 +90,25 @@
+ # After some kind of change in libc, it seems it is
  # required to #include <resolv.h> for the test to succeed.
  # To go around it I included the test for __res_init
- 
 -AC_CHECK_FUNC(res_init, , 
 -  AC_CHECK_LIB(bind, res_init, , 
 -   AC_CHECK_LIB(resolv, res_init, ,
--    AC_CHECK_LIB(c, __res_init, , AC_MSG_ERROR(No resolver library found)))))
+-    AC_CHECK_LIB(c, __res_init, , [AC_MSG_ERROR([No resolver library found])] ))))
 -
 -AC_CHECK_FUNC(res_mkquery, , 
 -  AC_CHECK_LIB(bind, res_mkquery, , 
--   AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found))))
+-   AC_CHECK_LIB(resolv, res_mkquery, , [AC_MSG_ERROR([No resolver library found])] )))
 +AC_CHECK_FUNC(res_init, , [
 +  AC_CHECK_FUNC(__res_init, , [
 +    AC_CHECK_LIB(resolv, res_init, , [
 +      AC_CHECK_LIB(resolv, __res_init, , [
-+      AC_CHECK_LIB(bind, res_init, , [AC_MSG_ERROR([No resolver library found])])
++       AC_CHECK_LIB(bind, res_init, , [AC_MSG_ERROR([No resolver library found])])
 +      ])
 +    ])
 +  ])
 +])
-+                         
++
 +AC_CHECK_FUNC(res_mkquery, , [
 +  AC_CHECK_FUNC(__res_mkquery, , [
 +    AC_CHECK_LIB(resolv, res_mkquery, , [
 +      AC_CHECK_LIB(resolv, __res_mkquery, , [
-+      AC_CHECK_LIB(bind, res_mkquery, , [AC_MSG_ERROR([No resolver library found])])
++       AC_CHECK_LIB(bind, res_mkquery, , [AC_MSG_ERROR([No resolver library found])])
 +      ])
 +    ])
 +  ])
 +])
- 
- # Check for the pcap library.
- AC_ARG_ENABLE(static-pcap,
+ else
+ AC_CHECK_FUNC(gethostbyaddr_r, , 
+   AC_CHECK_LIB(bind, gethostbyaddr_r, , 

diff --git a/etherape.spec b/etherape.spec
index edffc12efb8f85e9e7a0a77e1b6db3b3eb3332b4..a305eeb16b8c9d71594bf532a761d217b6e34fd4 100644 (file)
--- a/etherape.spec
+++ b/etherape.spec
@@ -2,20 +2,21 @@ Summary:      Graphical network viewer modeled after etherman
 Summary(pl):   Graficzny monitor sieci
 Summary(pt_BR):        Visualizador gráfico de redes modelado como o etherman
 Name:          etherape
-Version:       0.9.0
+Version:       0.9.4
 Release:       4
 License:       GPL
 Group:         Applications/Networking
 Source0:       http://dl.sourceforge.net/etherape/%{name}-%{version}.tar.gz
-# Source0-md5: a712f4cb04897d1a02ce988cffbf254c
-Patch0:                %{name}-bdf_h.patch
+# Source0-md5: 22f25464deca3f4a09f0247513ec5d2a
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-resolv.patch
+Patch3:                %{name}-Makefile.patch
 URL:           http://etherape.sourceforge.net/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel
+BuildRequires: libglade2
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libpcap-devel
 BuildRequires: pkgconfig
@@ -45,9 +46,9 @@ ethernet, ppp e slip.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
@@ -66,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT
        pixmapsdir=%{_pixmapsdir} \
        Developmentdir=%{_desktopdir}
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT