!44 [sync] PR-43: modify BuildRequies from gtk2-devel to gtk3-devel

From: @openeuler-sync-bot 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12

mtr-gtk-pkexec-wrapper.sh

@@ -7,4 +7,4 @@ if [ "$XDG_SESSION_TYPE" = wayland ]; then
     exit 1
 fi
 
-/usr/bin/pkexec /usr/bin/xmtr.bin
+/usr/bin/pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY /usr/bin/xmtr.bin

mtr.spec

@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:          mtr
-Version:       0.94
+Version:       0.95
-Release:       2
+Release:       3
 Epoch:         2
 Summary:       Ping and Traceroute Network Diagnostic Tool
 License:       GPLv2 and BSD
@@ -10,11 +10,12 @@ URL:           https://www.bitwizard.nl/mtr/
 Source0:       https://github.com/traviscross/mtr/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:       net-x%{name}.desktop
 Source2:       mtr-gtk-pkexec-wrapper.sh
+BuildRequires: git autoconf automake libtool ncurses-devel gtk3-devel desktop-file-utils
 
-BuildRequires: git autoconf automake libtool ncurses-devel gtk2-devel desktop-file-utils
+%if %{?openEuler:1}0
-
 Provides:       %{name}-gtk = %{epoch}:%{version}-%{release}
 Obsoletes:      %{name}-gtk < %{epoch}:%{version}-%{release}
+%endif
 
 %description
 It is a network diagnostic tool,it has the "ping" and "traceroute" features.
@@ -22,10 +23,22 @@ It prints information about the route and packets that sent from the host to
 the specified destination system.This tool can also print the response times
 and percentage for all network hops between the systems.
 
+%if %{!?openEuler:1}0
+%package gtk
+Summary: GTK interface for MTR
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description gtk
+MTR combines the functionality of the 'traceroute' and 'ping' programs
+in a single network diagnostic tool. The mtr-gtk package provides the
+GTK interface for MTR.
+%endif
+
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 
 %build
 export CFLAGS="%{optflags} -fPIE"
@@ -54,10 +67,18 @@ make test
 %files
 %license COPYING BSDCOPYING
 %doc AUTHORS FORMATS
+%if %{?openEuler:1}0
 %caps(cap_net_raw=pe)
 %{_bindir}/xmtr*
 %{_sbindir}/%{name}
 %{_sbindir}/%{name}-packet
+%else
+%caps(cap_net_raw=pe) %{_sbindir}/%{name}
+%caps(cap_net_raw=pe) %{_sbindir}/%{name}-packet
+ 
+%files gtk
+%{_bindir}/xmtr*
+%endif
 %{_datadir}/pixmaps/mtr_icon.xpm
 %{_datadir}/applications/net-x%{name}.desktop
 %{_datadir}/bash-completion/completions/%{name}
@@ -68,10 +89,35 @@ make test
 %{_mandir}/man8/*
 
 %changelog
-* Wed Mar 3 2021 lin.zhang <lin.zhang@turbolinux.com.cn> - 0.94-2
+* Thu Aug 29 2024 yanglu <yanglu72@h-partners.com> - 2:0.95-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:modify BuildRequies from gtk2-devel to gtk3-devel
+
+* Mon Oct 24 2022 xingwei <xingwei14@h-partners.com> - 2:0.95-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:modify fix xmtr cannot start in Xface4 environment
+
+* Tue Jun 28 2022 YukariChiba <i@0x7f.cc> - 2:0.95-1
+- Upgrade version to 0.95
+
+* Sat Jun 25 2022 gaihuiying <eaglegai@163.com> - 2:0.94-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add macros to control if detach the GTK package from the master package
+       modify changelog  to add epoch:2
+
+* Fri Mar 11 2022 lin.zhang <lin.zhang@turbolinux.com.cn> - 2:0.94-3
+- add patch fix_for_printw_error.patch
+
+* Wed Mar 3 2021 lin.zhang <lin.zhang@turbolinux.com.cn> - 2:0.94-2
 - modify net-xmtr.desktop file for Xfce4 Traceroute
 
-* Tue Jan 26 2021 SimpleUpdate Robot <tc@openeuler.org> - 0.94-1
+* Tue Jan 26 2021 SimpleUpdate Robot <tc@openeuler.org> - 2:0.94-1
 - Upgrade to version 0.94
 
 * Mon Jul 20 2020 cuibaobao <cuibaobao1@huawei.com> - 2:0.93-9

net-xmtr.desktop

@@ -3,7 +3,7 @@ Name=Traceroute
 Type=Application
 Comment=Traces packets between two network hosts
 Exec=xmtr
-Terminal=true
+Terminal=false
 Icon=mtr_icon.xpm
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.2