diff --git a/mtr-glib2.patch b/mtr-glib2.patch deleted file mode 100644 index 76a53fa..0000000 --- a/mtr-glib2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in ---- mtr-0.83/configure.in.glib2 2013-02-18 20:10:00.767417356 +0100 -+++ mtr-0.83/configure.in 2013-02-18 20:10:53.549513018 +0100 -@@ -59,6 +59,8 @@ else - GTK_OBJ="" - fi - -+PKG_CHECK_MODULES([GLIB2], [glib-2.0]) -+ - AC_CHECK_FUNC(socket, , - AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) - -diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am ---- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100 -+++ mtr-0.83/Makefile.am 2013-02-18 20:16:17.877101679 +0100 -@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \ - mtr-gtk.h - EXTRA_mtr_SOURCES = curses.c \ - gtk.c -+AM_CFLAGS = $(GLIB2_CFLAGS) - mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ) --mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) -+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ) - - EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist - distclean-local: diff --git a/mtr.spec b/mtr.spec index 52f8d4c..69c04b3 100644 --- a/mtr.spec +++ b/mtr.spec @@ -1,25 +1,22 @@ Summary: A network diagnostic tool Name: mtr -Version: 0.83 -Release: 2%{?dist} -Epoch: 2 +Version: 0.84 +Release: 1%{?dist} +Epoch: 2 Group: Applications/Internet License: GPLv2+ URL: http://www.BitWizard.nl/mtr -Source: ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz +Source: ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz Source1: xmtr.consolehelper Source2: xmtr.pam Source3: net-x%{name}.desktop Patch1: mtr-crash-in-xml-mode.patch Patch2: mtr-xml-format-fixes.patch -Patch3: mtr-glib2.patch BuildRequires: ncurses-devel gtk2-devel desktop-file-utils BuildRequires: autoconf automake libtool -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - %description Mtr is a network diagnostic tool that combines ping and traceroute into one program. Mtr provides two interfaces: an ncurses interface, @@ -41,45 +38,38 @@ diagnostic tool. %patch1 -p1 %patch2 -p1 -touch ChangeLog -%patch3 -p1 -b .glib2 %build -autoreconf -fiv %configure --enable-gtk2 make %{?_smp_mflags} && mv mtr xmtr && make distclean %configure --without-gtk make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 0755 mtr $RPM_BUILD_ROOT/%{_sbindir}/mtr -make DESTDIR=$RPM_BUILD_ROOT install - -install -m 0755 xmtr $RPM_BUILD_ROOT/%{_bindir}/xmtr.bin -install -m 644 img/mtr_icon.xpm $RPM_BUILD_ROOT/usr/share/pixmaps -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/xmtr -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xmtr -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -ln -fs consolehelper $RPM_BUILD_ROOT/%{_bindir}/xmtr - -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications +mkdir -p %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{_sbindir} +mkdir -p %{buildroot}/%{_datadir}/pixmaps +mkdir -p %{buildroot}/%{_mandir}/man8 +install -m 0755 mtr %{buildroot}/%{_sbindir}/mtr +make DESTDIR=%{buildroot} install + +install -m 0755 xmtr %{buildroot}/%{_bindir}/xmtr.bin +install -m 644 img/mtr_icon.xpm %{buildroot}/usr/share/pixmaps +mkdir -p %{buildroot}/%{_sysconfdir}/security/console.apps +install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/security/console.apps/xmtr +mkdir -p %{buildroot}/%{_sysconfdir}/pam.d +install -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/xmtr +mkdir -p %{buildroot}/%{_bindir} +ln -fs consolehelper %{buildroot}/%{_bindir}/xmtr + +mkdir -p %{buildroot}/%{_datadir}/applications desktop-file-install \ %if 0%{?fedora} && 0%{?fedora} < 19 - --vendor="fedora" \ + --vendor="fedora"\ %endif - --dir=${RPM_BUILD_ROOT}/%{_datadir}/applications \ - %{SOURCE3} - -%clean -rm -rf $RPM_BUILD_ROOT + --dir=%{buildroot}/%{_datadir}/applications\ + %{SOURCE3} %files %defattr(-,root,root,-) @@ -101,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/mtr_icon.xpm %changelog +* Wed Apr 03 2013 Michal Sekletar - 2:0.84-1 +- update to the newest upstream release +- specfile cleanup + * Mon Feb 18 2013 Adam Tkac - 2:0.83-2 - make non-gtk version of mtr buildable @@ -234,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Mar 02 2005 Phil Knirsch 2:0.69-3 - bump release and rebuild with gcc 4 -* Thu Feb 10 2005 Karsten Hopp 2:0.69-2 +* Thu Feb 10 2005 Karsten Hopp 2:0.69-2 - build with --enable-gtk2 (John Thacker) * Wed Feb 09 2005 Phil Knirsch 2:0.69-1 @@ -356,8 +350,8 @@ rm -rf $RPM_BUILD_ROOT * Thu Aug 19 1999 Ryan Weaver [mtr-0.41-1] -- Added afr's patch to allow disabeling of gtk without Robn's hack. -- Made report mode report the newly added extra resolution. +- Added afr's patch to allow disabeling of gtk without Robn's hack. +- Made report mode report the newly added extra resolution. * Wed Aug 18 1999 Ryan Weaver - renamed mtr-gtk to xmtr @@ -383,12 +377,12 @@ rm -rf $RPM_BUILD_ROOT * Mon Apr 12 1999 Ryan Weaver [mtr-0.37-1] - v0.37 -- Added Bill Bogstad's "show the local host & time" patch. +- Added Bill Bogstad's "show the local host & time" patch. - Added R. Sparks' show-last-ping patch, submitted by Philip Kizer. - v0.36 - Added Craigs change-the-interval-on-the-fly patch. -- Added Moritz Barsnick's "do something sensible if host not found" +- Added Moritz Barsnick's "do something sensible if host not found" patch. - Some cleanup of both Craigs and Moritz' patches.