automatic import of freerouteropeneuler24.03_LTS

1 files changed, 16 insertions, 3 deletions

diff --git a/freerouter.spec b/freerouter.spec
index c4949c0..7b19cce 100644
--- a/freerouter.spec
+++ b/freerouter.spec
@@ -3,7 +3,7 @@
 %define _use_weak_usergroup_deps 1
 
 Name:           freerouter
-Version:        25.8.30
+Version:        25.11.9
 Release:        1%{?dist}
 Summary:        Free, open source router OS process
 
@@ -24,6 +24,8 @@ Source11:       veth250.network
 Source12:       veth251.network
 Source13:       veth251.netdev
 Source14:       80-freerouter.conf
+Source15:       rtr-hw.txt
+Source16:       rtr-sw.txt
 
 BuildRequires:  clang llvm
 BuildRequires:  dpdk-devel
@@ -32,12 +34,15 @@ BuildRequires:  libpcap-devel
 BuildRequires:  liburing-devel
 BuildRequires:  libxdp-devel
 BuildRequires:  openssl-devel
-BuildRequires:  systemd
+BuildRequires:  systemd zip
 BuildRequires:  java-21-openjdk-devel
 Requires:       java-21-openjdk-headless
 Recommends:     freerouter-native
 Recommends:     socat
 Recommends:     telnet
+%if 0%{?fedora} || 0%{?suse_version}
+Requires(pre):  group(dialout)
+%endif
 
 %description
 freeRouter speaks routing protocols, and (re)encapsulates packets on
@@ -73,6 +78,14 @@ Examples of freeRouter test configurations.
 %prep
 %setup -q -n freeRtr-%{?version}
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} .
+cp %{SOURCE15} %{SOURCE16} misc
+
+%if 0%{?suse_version}
+sed -i 's|/usr/bin/freerouter|/usr/lib64/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service
+sed -i 's|libmnl/libmnl.h|libmnl/libmnl/libmnl.h|g' misc/native/{p4mnl_user.c,veth.c}
+%else
+sed -i 's|/usr/bin/freerouter|/usr/lib/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service
+%endif
 
 %build
 pushd src
@@ -88,7 +101,6 @@ popd
 %install
 find binTmp -size 0 -print -delete
 find misc/demo -type f -not -name '*.txt' -delete
-sed -i 's|/usr/bin/freerouter|/usr/lib/jvm/jre-21-openjdk/bin/java -jar /usr/share/java/rtr.jar|g' misc/debian2/freerouter.service
 
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
@@ -157,6 +169,7 @@ usermod -aG dialout freerouter
 %doc freerouter-p4emu.service freerouter-p4mnl.service
 %doc freerouter-p4udp.service freerouter-p4urng.service
 %doc freerouter-p4xdp.service freerouter-p4xsk.service
+%doc misc/rtr-hw.txt misc/rtr-sw.txt
 %dir %{_sysconfdir}/freerouter/interfaces
 %config(noreplace) %{_sysconfdir}/sysctl.d/80-freerouter.conf
 %config(noreplace) %{_sysconfdir}/freerouter/interfaces/cpu_port