SOURCES/mrtg-2.17.7-traffic-sum-man-option.patch

@@ -1,12 +0,0 @@
-diff -up mrtg-2.17.7/bin/mrtg-traffic-sum.orig mrtg-2.17.7/bin/mrtg-traffic-sum
---- mrtg-2.17.7/bin/mrtg-traffic-sum.orig	2018-10-18 12:21:12.616589922 +0200
-+++ mrtg-2.17.7/bin/mrtg-traffic-sum	2018-10-18 12:23:10.852648709 +0200
-@@ -58,7 +58,7 @@ sub mailout($$);
- sub main()
- {
-     # parse options
--    GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s') or exit(1);
-+    GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s','man') or exit(1);
-     if($opt{help})     { pod2usage(1) }
-     if($opt{man})      { pod2usage(-exitstatus => 0, -verbose => 2) }
-     if($opt{version})  { print "mrtg-traffic-sum $Revision\n"; exit(0) }

SPECS/mrtg.spec

@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.17.7
-Release:   10%{?dist}
+Release:   1%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@@ -28,19 +28,16 @@ Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.17.2-socket6-fix.patch
 # Patch2: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches)
 Patch2:    mrtg-2.17.4-cfgmaker-ifhighspeed.patch
-# Patch3: fixes 'man' option in mrtg-traffic-sum, see rhbz#1612188
-Patch3:    mrtg-2.17.7-traffic-sum-man-option.patch
 License:   GPLv2+
+Group:     Applications/Internet
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-Requires:  perl-Socket6 perl-IO-Socket-INET6 perl-locale
+Requires:  perl-Socket6 perl-IO-Socket-INET6
 Requires:  gd
-BuildRequires: make
 BuildRequires: gd-devel, libpng-devel
 BuildRequires: perl-generators
 BuildRequires: systemd-units
-BuildRequires: gcc
 
 %global __find_requires %{SOURCE3}
 %global __find_provides %{SOURCE6}
@@ -55,7 +52,6 @@ images which provide a LIVE visual representation of this traffic.
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .socket6
 %patch2 -p1 -b .ifhighspeed
-%patch3 -p1 -b .traffic-sum-man-option
 
 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -142,50 +138,13 @@ fi
 %{_unitdir}/mrtg.timer
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.17.7-10
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.17.7-1
+- Rebuilt for MSVSphere 8.8
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.17.7-9
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 09 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-7
-- Add Requires perl-locale
-  Resolves: #1895580
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Oct 18 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-2
-- Fix mrtg-traffic-sum incorrectly ignores 'man' option
-  Resolves: #1612188
-
-* Thu Aug 09 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-1
+* Mon Aug 13 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-1
 - Use %%license
 - Update to mrtg-2.17.7
-  Resolves: #1600933
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Feb 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-23
-- Add BuildRequires gcc
-- Remove Group tag
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+  Resolves: #1615340
 
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild