spec: update to the newest upstream release 0.84

Update to the version 0.84 and some specfile cleanup

Signed-off-by: Michal Sekletar <msekleta@redhat.com>
This commit is contained in:
Michal Sekletar 2013-04-03 15:59:02 +02:00
parent 0fcca6ea1d
commit b450aa47e4
2 changed files with 31 additions and 63 deletions

View File

@ -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:

View File

@ -1,7 +1,7 @@
Summary: A network diagnostic tool
Name: mtr
Version: 0.83
Release: 2%{?dist}
Version: 0.84
Release: 1%{?dist}
Epoch: 2
Group: Applications/Internet
License: GPLv2+
@ -13,13 +13,10 @@ 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,46 +38,39 @@ 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
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 $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
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 $RPM_BUILD_ROOT/%{_datadir}/applications
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 \
--dir=%{buildroot}/%{_datadir}/applications\
%{SOURCE3}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING FORMATS NEWS README SECURITY
@ -101,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/mtr_icon.xpm
%changelog
* Wed Apr 03 2013 Michal Sekletar <msekleta@redhat.com> - 2:0.84-1
- update to the newest upstream release
- specfile cleanup
* Mon Feb 18 2013 Adam Tkac <atkac redhat com> - 2:0.83-2
- make non-gtk version of mtr buildable