diff --git a/.gitignore b/.gitignore index 2b7f668..8607f58 100644 --- a/.gitignore +++ b/.gitignore @@ -12,5 +12,3 @@ /FusionInventory-Agent-2.4.3.tar.gz /FusionInventory-Agent-2.5.tar.gz /FusionInventory-Agent-2.5.1.tar.gz -/FusionInventory-Agent-2.5.2.tar.gz -/FusionInventory-Agent-2.6.tar.gz diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec index 8b94faf..e1fc3a3 100644 --- a/fusioninventory-agent.spec +++ b/fusioninventory-agent.spec @@ -5,33 +5,18 @@ Name: fusioninventory-agent Summary: FusionInventory agent -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://fusioninventory.org/ -Version: 2.6 -Release: 15%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Source0: https://github.com/fusioninventory/%{name}/releases/download/%{version}/FusionInventory-Agent-%{version}.tar.gz Source1: %{name}.cron Source10: %{name}.service -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: make +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: perl-generators -BuildRequires: perl-interpreter -BuildRequires: perl(Config) -BuildRequires: perl(English) -BuildRequires: perl(inc::Module::Install) -BuildRequires: perl(Module::AutoInstall) -BuildRequires: perl(Module::Install::Include) -BuildRequires: perl(Module::Install::Makefile) -BuildRequires: perl(Module::Install::Metadata) -BuildRequires: perl(Module::Install::Scripts) -BuildRequires: perl(Module::Install::WriteAll) -BuildRequires: perl(strict) -BuildRequires: perl(warnings) -BuildRequires: sed +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: systemd Requires: perl-FusionInventory-Agent = %{version}-%{release} @@ -77,6 +62,7 @@ You can add additional packages for optional tasks: %package -n perl-FusionInventory-Agent Summary: Libraries for Fusioninventory agent BuildArch: noarch +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(LWP) Requires: perl(Net::CUPS) Requires: perl(Net::SSLeay) @@ -149,10 +135,6 @@ fusioninventory cron task %prep %setup -q -n FusionInventory-Agent-%{version} -# Remove bundled modules -rm -rf ./inc -sed -e '/^inc\//d' -i MANIFEST - sed \ -e "s/logger = .*/logger = syslog/" \ -e "s/logfacility = .*/logfacility = LOG_DAEMON/" \ @@ -238,8 +220,6 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/fusioninventory/inventory-server-plugin.cfg %config(noreplace) %{_sysconfdir}/fusioninventory/server-test-plugin.cfg %config(noreplace) %{_sysconfdir}/fusioninventory/ssl-server-plugin.cfg -%config(noreplace) %{_sysconfdir}/fusioninventory/proxy-server-plugin.cfg -%config(noreplace) %{_sysconfdir}/fusioninventory/proxy2-server-plugin.cfg %{_unitdir}/%{name}.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d @@ -300,89 +280,10 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 2.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 2.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 2.6-13 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 2.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 2.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 01 2022 Jitka Plesnikova - 2.6-6 -- Perl 5.36 rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 21 2021 Jitka Plesnikova - 2.6-3 -- Perl 5.34 rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.6-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Fri Jan 29 2021 Marianne Lombard - 2.6-1 -- Bump release to 2.6 - -* Tue Jan 26 2021 Fedora Release Engineering - 2.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 23 2020 Jitka Plesnikova - 2.5.2-4 -- Perl 5.32 rebuild - -* Thu Mar 12 2020 Petr Pisar - 2.5.2-3 -- Specify all dependencies and unbundle Module::Install - -* Tue Jan 28 2020 Fedora Release Engineering - 2.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Dec 17 2019 Johan Cwiklinski - 2.5.2-1 -- Last upstream release -- Drop patch applied upstream - -* Mon Aug 12 2019 Marianne Lombard - 2.5.1-4 -- Fixing patch (thanks to E. Seyman - eseyman AT fedoraproject DOT org - help) and applying it -- Fix issue #1735227 : FTBFS - -* Thu Jul 25 2019 Fedora Release Engineering - 2.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 15 2019 Johan Cwiklinski - 2.5.1-2 -- Add upstream HTTP server patch -- add missing configuration files - * Mon Jul 08 2019 Johan Cwiklinski - 2.5.1-1 - Last upstream release - Remove patches applied upstream -* Thu May 30 2019 Jitka Plesnikova - 2.5-5 -- Perl 5.30 rebuild - * Tue May 07 2019 Johan Cwiklinski - 2.5-4 - Add patch to fix SSL on with http modules @@ -404,8 +305,8 @@ install -m 644 -D %{SOURCE10} %{buildroot}%{_unitdir}/%{name}.service * Mon Feb 25 2019 Johan Cwiklinski - 2.4.3-1 - Last upstream release -* Thu Jan 31 2019 Fedora Release Engineering - 2.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Tue Dec 18 2018 Johan Cwiklinski - 2.4.2-2 +- Rebuild for BZ #1650041 * Wed Oct 03 2018 Johan Cwiklinski - 2.4.2-1 - Last upstream release diff --git a/sources b/sources index 76629c3..3592c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FusionInventory-Agent-2.6.tar.gz) = b400e8bbf1be117c110622e6f1e2e2eee744c4e79bf3686c9e4c9126f7d4cb7f2224149ab4e7ad9a686d0cdbcbe2aef1128766359270c7e9f00d78552f51aa45 +SHA512 (FusionInventory-Agent-2.5.1.tar.gz) = c8c44801acdd574d5b4a2173f5f7b0b6275abc2ac4925c64313a1dde3a717d796e7f5d9a35e9b02b966f08cb985e3ae064d8797de0c30fede8b131bc9bb64955