diff --git a/.gitignore b/.gitignore index ac15078..71d5ee5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -/amprd-*.tgz +/amprd-1.4.tgz +/amprd-1.5.tgz +/amprd-1.6.tgz +/amprd-2.1.tgz diff --git a/amprd-3.0-install-fix.patch b/amprd-1.6-install-fix.patch similarity index 80% rename from amprd-3.0-install-fix.patch rename to amprd-1.6-install-fix.patch index d9bace1..aa69b10 100644 --- a/amprd-3.0-install-fix.patch +++ b/amprd-1.6-install-fix.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 5ba1f27..9525629 100644 +index e74ab04..5121178 100644 --- a/Makefile +++ b/Makefile -@@ -34,8 +34,8 @@ module_clean: +@@ -26,5 +26,5 @@ clean: install: amprd install -m 755 -p -d -D $(SCACHEDIR) @@ -10,6 +10,3 @@ index 5ba1f27..9525629 100644 - install -m 755 -p -s -D amprd $(SBINDIR)/amprd + install -m 644 -p -D amprd.conf.example $(CONFDIR)/amprd.conf + install -m 755 -p -D amprd $(SBINDIR)/amprd - - uninstall: - rm -fr $(SCACHEDIR) diff --git a/amprd.spec b/amprd.spec index a0f0f7a..baed5dc 100644 --- a/amprd.spec +++ b/amprd.spec @@ -8,21 +8,18 @@ Summary: An user-space IPIP encapsulation daemon for the ampr network Name: amprd -Version: 3.0.1 -Release: 11%{?dist} -# Automatically converted from old format: GPLv3+ - review is highly recommended. -License: GPL-3.0-or-later +Version: 2.1 +Release: 4%{?dist} +License: GPLv3+ +Group: Applications/Communications URL: http://www.yo2loj.ro/hamprojects/ -BuildRequires: gcc -BuildRequires: dos2unix -BuildRequires: systemd -BuildRequires: make +BuildRequires: dos2unix, systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Source0: http://www.yo2loj.ro/hamprojects/%{name}-%{version}.tgz Source1: amprd.service -Patch0: amprd-3.0-install-fix.patch +Patch0: amprd-1.6-install-fix.patch %description An user-space IPIP encapsulation daemon with automatic RIPv2 multicast @@ -32,7 +29,8 @@ inside the daemon and it offers one or more virtual TUN interfaces to the system for your 44net traffic. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 -b .install-fix dos2unix minGlue.h @@ -40,7 +38,7 @@ dos2unix minGlue.h make %{?_smp_mflags} CFLAGS="%{optflags} %{?cflags_harden}" LDFLAGS="%{?__global_ldflags} %{?ldflags_harden}" %install -make %{?_smp_mflags} DESTDIR=%{buildroot} SBINDIR=%{buildroot}%{_sbindir} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install # Systemd install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service @@ -68,80 +66,6 @@ install -Dpm 644 -t %{buildroot}%{_datadir}/%{name} startup_example.sh interface %{_unitdir}/amprd.service %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 3.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 3.0.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 3.0.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 3.0.1-8 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 3.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 3.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 3.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 3.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 12 2022 Jaroslav Škarvada - 3.0.1-1 -- New version - Resolves: rhbz#2103065 - -* Wed Jan 19 2022 Fedora Release Engineering - 3.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 3.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.0-7 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 3.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Fedora Release Engineering - 3.0-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 2 2019 Jaroslav Škarvada - 3.0-1 -- New version - Resolves: rhbz#1705380 - -* Thu Jan 31 2019 Fedora Release Engineering - 2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Jaroslav Škarvada - 2.1-6 -- Fixed FTBFS by adding gcc requirement - Resolves: rhbz#1603377 - -* Thu Jul 12 2018 Fedora Release Engineering - 2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Wed Feb 07 2018 Fedora Release Engineering - 2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index f244163..a99e8e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (amprd-3.0.1.tgz) = 35c28d1fc56cb75dcacfff740f81ec86cffde299551eb9522836316ac19daa0d904a298a8d355ec8b64b29b679b1538dba561c537a81068bc60b9aed2581ba6e +SHA512 (amprd-2.1.tgz) = 503aca59dde7dd635eb3b561a5c7f2bbf8c04af35781b3f3b9cbe567dc35dce4349897aca0872a6a53f7295d52dda317cfb7ad156931e688d634a2073d704d3b