Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

3 changed files with 21 additions and 64 deletions

View file

@ -1,17 +1,15 @@
diff --git a/Makefile b/Makefile
index 591b768..fad88d1 100644
index deeaf46..ab4cb71 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,12 @@
@@ -2,14 +2,10 @@
# Makefile for ampr-ripd
#
-BASEDIR = /usr
+BASEDIR = $(DESTDIR)/usr
SBINDIR = $(BASEDIR)/sbin
ifneq ($(OPENWRT_BUILD),1)
MANDIR = $(BASEDIR)/share/man/man1
endif
MANDIR = $(BASEDIR)/share/man/man1
-SCACHEDIR = /var/lib/ampr-ripd
-
-# no need to run ampr-ripd as root
@ -19,9 +17,9 @@ index 591b768..fad88d1 100644
-GRP = daemon
+SCACHEDIR = $(DESTDIR)/var/lib/ampr-ripd
ifndef CC
CC = gcc
@@ -27,11 +23,11 @@ endif
CC = gcc
@@ -23,11 +19,11 @@ CC = gcc
# Full debug
DOPT = -D HAVE_DEBUG
@ -36,18 +34,14 @@ index 591b768..fad88d1 100644
all: ampr-ripd
@@ -39,9 +35,8 @@ clean:
@@ -35,7 +31,6 @@ clean:
rm -f ampr-ripd
install: ampr-ripd
- strip ampr-ripd
- install -m 755 -o $(OWN) -g $(GRP) -d $(SCACHEDIR)
- install -m 755 -o $(OWN) -g $(GRP) ampr-ripd $(SBINDIR)
- ifneq ($(OPENWRT_BUILD),1)
- install -m 644 -o $(OWN) -g $(GRP) ampr-ripd.1 $(MANDIR)
- endif
- install -m 644 -o $(OWN) -g $(GRP) ampr-ripd.1 $(MANDIR)
+ install -m 755 -p -D -d $(SCACHEDIR)
+ install -m 755 -p -D ampr-ripd $(SBINDIR)/ampr-ripd
+ifneq ($(OPENWRT_BUILD),1)
+ install -m 644 -p -D ampr-ripd.1 $(MANDIR)/ampr-ripd.1
+endif

View file

@ -8,14 +8,11 @@
Summary: Routing daemon for the ampr network
Name: ampr-ripd
Version: 2.4.2
Release: 3%{?dist}
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
Version: 2.4.1
Release: 1%{?dist}
License: GPLv2+
URL: http://www.yo2loj.ro/hamprojects/
BuildRequires: gcc
BuildRequires: dos2unix
BuildRequires: systemd
BuildRequires: gcc, dos2unix, systemd
BuildRequires: make
Requires(post): systemd
Requires(preun): systemd
@ -24,23 +21,26 @@ Source0: http://www.yo2loj.ro/hamprojects/%{name}-%{version}.tgz
Source1: ampr-ripd.service
# upstream notified
Source2: COPYING
Patch: ampr-ripd-2.4.2-install-fix.patch
Patch: ampr-ripd-2.1.1-examples-noshebang.patch
Patch: ampr-ripd-2.4.1-pidfile.patch
Patch0: ampr-ripd-2.4.1-install-fix.patch
Patch1: ampr-ripd-2.1.1-examples-noshebang.patch
Patch2: ampr-ripd-2.4.1-pidfile.patch
%description
Routing daemon written in C similar to Hessu's rip44d including optional
resending of RIPv2 broadcasts for router injection.
%prep
%autosetup -p1
%setup -q
%patch0 -p1 -b .install-fix
%patch1 -p1 -b .examples-noshebang
%patch2 -p1 -b .pidfile
cp %{SOURCE2} .
%build
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,43 +68,6 @@ install -Dpm 644 -t %{buildroot}%{_datadir}/%{name}/examples examples/ampr-run.s
%{_unitdir}/%{name}.service
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon May 5 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.2-1
- New version
Resolves: rhbz#2363569
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.4.1-9
- convert license to SPDX
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.1-1
- New version
Resolves: rhbz#2030369

View file

@ -1 +1 @@
SHA512 (ampr-ripd-2.4.2.tgz) = 5bb80ed08960b882c88d2d36957442f86403803c5810f8222135961c043a6359d94164ef6f6e74a420c92baee2e712e9b3e078f9039c70754a2c81741c29f0d7
SHA512 (ampr-ripd-2.4.1.tgz) = 26a4265a7be8a1d05836d106b5ea1f544739f99f3d4426038191453accb96945bbe12ddb72c4bdd6be7707bab16a15b9c6732d7f13f2ac450d4c6d4048ce7914