Compare commits

..

1 commit

Author SHA1 Message Date
Zbigniew Jędrzejewski-Szmek
d733a4c209 Fix FTBFS
... (rhbz#2244833, rhbz#2340163)

With apologies to python-sig members ;(

(cherry picked from commit 23a5f53cc0)
2025-03-14 17:33:04 +01:00

View file

@ -12,7 +12,7 @@
Version: 0.68.5.1
Name: flow-tools
Summary: Tool set for working with NetFlow data
Release: 45%{?dist}
Release: 42%{?dist}
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
URL: http://code.google.com/p/%{name}/
@ -37,8 +37,11 @@ BuildRequires: doxygen
%if 0%{?fedora} >= 31
BuildRequires: python3.12
%endif
Requires(pre): shadow-utils
BuildRequires: systemd-rpm-macros
BuildRequires: make
Provides: group(%username)
Provides: user(%username)
%description
@ -116,11 +119,6 @@ sed -i '1s|^#!.*perl|#!/usr/bin/perl|' utils/*
# Fix mariadb-connector-c detection
sed -i s/my_init/mysql_init/g configure
# Create a sysusers.d config file
cat >flow-tools.sysusers.conf <<EOF
u flow-tools - '%{gecos}' %{homedir} -
EOF
%build
export CFLAGS="$CFLAGS -std=gnu17"
%configure \
@ -147,8 +145,12 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT%{_unitdir}/flow-capture.service
install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tools.conf
%pre
getent group %{username} >/dev/null || groupadd -r %{username}
getent passwd %{username} >/dev/null || \
useradd -r -g %{username} -d %{homedir} -s /sbin/nologin \
-c '%{gecos}' %{username}
exit 0
%post
@ -220,7 +222,6 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool
%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*
%{_sysusersdir}/flow-tools.conf
%files devel
%{_libdir}/*.so
@ -236,15 +237,6 @@ install -m0644 -D flow-tools.sysusers.conf %{buildroot}%{_sysusersdir}/flow-tool
%doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
%changelog
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.68.5.1-44
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.68.5.1-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 0.68.5.1-42
- convert license to SPDX