This commit is contained in:
Luca Deri
2024-02-05 18:12:42 +01:00
parent b86452f2b1
commit a4da4467ac
+4 -13
View File
@@ -49,7 +49,10 @@ you will need to install %{name}-dev.
PATH=/usr/bin:/bin:/usr/sbin:/sbin PATH=/usr/bin:/bin:/usr/sbin:/sbin
%define includedir /usr/include/ndpi %define includedir /usr/include/ndpi
%{?el7:%define libdir /usr/lib}
# Default and fallback
%define libdir /usr/lib
%{?el8:%define libdir /usr/lib64} %{?el8:%define libdir /usr/lib64}
%{?el9:%define libdir /usr/lib64} %{?el9:%define libdir /usr/lib64}
%define bindir /usr/bin %define bindir /usr/bin
@@ -83,16 +86,9 @@ rm -fr $RPM_BUILD_ROOT
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%if %{defined libdir}
%{libdir}/libndpi.so %{libdir}/libndpi.so
%{libdir}/libndpi.so.@MAJOR_RELEASE@ %{libdir}/libndpi.so.@MAJOR_RELEASE@
%{libdir}/libndpi.so.@PACKAGE_VERSION@ %{libdir}/libndpi.so.@PACKAGE_VERSION@
%else
# Fallback for rpmbuild on Ubuntu (CI)
/usr/lib/libndpi.so
/usr/lib/libndpi.so.@MAJOR_RELEASE@
/usr/lib/libndpi.so.@PACKAGE_VERSION@
%endif
/usr/bin/ndpiReader /usr/bin/ndpiReader
/usr/share/ndpi/ndpiCustomCategory.txt /usr/share/ndpi/ndpiCustomCategory.txt
/usr/share/ndpi/ndpiProtos.txt /usr/share/ndpi/ndpiProtos.txt
@@ -106,12 +102,7 @@ rm -fr $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{includedir} %{includedir}
%if %{defined libdir}
%{libdir}/libndpi.a %{libdir}/libndpi.a
%else
# Fallback for rpmbuild on Ubuntu (CI)
/usr/lib/libndpi.a
%endif
%changelog %changelog
* Mon Nov 19 2018 Alfredo Cardigliano <cardigliano@ntop.org> 2.5 * Mon Nov 19 2018 Alfredo Cardigliano <cardigliano@ntop.org> 2.5