0001-support-clang-build.patch

@@ -1,29 +0,0 @@
-From 92a59ec22b6b4c097c6aee6898071d66b8ce381c Mon Sep 17 00:00:00 2001
-From: luofeng <luofeng13@huawei.com>
-Date: Mon, 11 Mar 2024 12:15:11 +0800
-Subject: [PATCH] support clang build
-
----
- Make.rules | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Make.rules b/Make.rules
-index f1ddc25..fa7c662 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -36,10 +36,10 @@ endif
- 
- 
- $(call set, CROSS, )
--$(call set, CC, $$(CROSS)gcc)
-+$(call set, CC, $$(CROSS)$(CC))
- $(call set, AS, $$(CROSS)as)
- $(call set, LD, $$(CROSS)ld)
--$(call set, DEPEND, $$(CROSS)gcc -MM -MG)
-+$(call set, DEPEND, $$(CROSS)$(CC) -MM -MG)
- $(call set, AR, $$(CROSS)ar)
- $(call set, RANLIB, $$(CROSS)ranlib)
- $(call set, INSTALL, cp)
--- 
-2.19.1
-

traceroute.spec

@@ -1,19 +1,17 @@
 Name:               traceroute
 Epoch:              3
-Version:            2.1.5
+Version:            2.1.0
-Release:            2
+Release:            11
 Summary:            A new modern implementation of traceroute(8) utility for Linux systems
-License:            GPL-2.0-or-later
+License:            GPLv2+
 URL:                http://traceroute.sourceforge.net/
-Source0:            https://sourceforge.net/projects/traceroute/files/traceroute/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:            https://udomain.dl.sourceforge.net/project/traceroute/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz
 
 Provides:           tcptraceroute = 1.5-1
 Obsoletes:          tcptraceroute < 1.5-1
 
 BuildRequires:      gcc
 
-Patch0001: 0001-support-clang-build.patch
-
 %description
 Traceroute tracks the route packets taken from an IP network on their way
 to a given host. It utilizes the IP protocol's time to live (TTL) field
@@ -26,19 +24,31 @@ along the path to the host.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%make_build  CFLAGS="$RPM_OPT_FLAGS"  LDFLAGS="$RPM_LD_FLAGS" SKIPDIRS="${RPM_SPECPARTS_DIR##*/}"
+make  CFLAGS="$RPM_OPT_FLAGS"  LDFLAGS="$RPM_LD_FLAGS"
 
 %install
-install -D -p -m755 traceroute/traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute
+mkdir -p $RPM_BUILD_ROOT/bin
-ln -s traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute6
+install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
-install -D -p -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}/tcptraceroute
+
-install -D -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute.8
+pushd $RPM_BUILD_ROOT/bin
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8
+ln -s traceroute traceroute6
-ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8
+popd
+
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}
+
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
+pushd $RPM_BUILD_ROOT%{_mandir}/man8
+ln -s traceroute.8 traceroute6.8
+ln -s traceroute.8 tcptraceroute.8
+popd
 
 %files
 %defattr(-,root,root)
 %license COPYING
+/bin/*
 %{_bindir}/*
 
 %files help
@@ -47,33 +57,6 @@ ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8
 %{_mandir}/*/*
 
 %changelog
-* Fri Mar 1 2024 luofeng <luofeng13@huawei.com> - 3:2.1.5-2
-- support clang build
-
-* Fri Dec 29 2023 Xingwei <xingwei14@h-partners.com> - 3:2.1.5-1
-- Type:requirement
-- Id:NA
-- SUG:NA
-- DESC:Update to version 2.1.5
-
-* Mon Oct 30 2023 xingwei <xingwei14@h-partners.com> - 3:2.1.2-2
-- Type:CVE
-- CVE:CVE-2023-46316
-- SUG:NA
-- DESC:fix CVE-2023-46316
-
-* Jul Sat 22 2023 Xingwei <xingwei14@h-partners.com> - 3:2.1.2-1
-- Type:requirement
-- Id:NA
-- SUG:NA
-- DESC:Update to version 2.1.2
-
-* Thu Feb 2 2023 Cao Jingbo <caojb@chinatelecom.cn> - 3:2.1.1-1
-- Type:enhancement
-- Id:NA
-- SUG:NA
-- DESC:Update to version 2.1.1
-
 * Tue Sep 8 2020 lunankun <lunankun@huawei.com> - 2.1.0-11
 - Type:bugfix
 - Id:NA