perl 5.38.0 rebuild

[packages/flowd.git] / flowd.spec

diff --git a/flowd.spec b/flowd.spec
index 0876aef0e9c2749ab2c46bb61175c013a9552224..cab6030273159b02edd5b7cb125386254c1de855 100644 (file)
--- a/flowd.spec
+++ b/flowd.spec
@@ -2,23 +2,25 @@
 # Conditional build:
 %bcond_without tests           # build without tests
 #
-%include       /usr/lib/rpm/macros.perl
 Summary:       The flowd NetFlow collector daemon
 Summary(pl.UTF-8):     flowd - demon zbierania danych NetFlow
 Name:          flowd
 Version:       0.9.1
-Release:       1
+Release:       18
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://www.mindrot.org/files/flowd/%{name}-%{version}.tar.gz
 # Source0-md5: a3d0512b5e6d9c7d9e749d9894376ea4
 Patch0:                %{name}-username.patch
+Patch1:                format-error.patch
 URL:           http://www.mindrot.org/flowd.html
 BuildRequires: byacc
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: python-devel
+BuildRequires: python-modules
 BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.710
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -65,7 +67,7 @@ przepływów sieciowych flowd oraz przykładowy program czytający.
 Summary:       Python API to access flowd logfiles
 Summary(pl.UTF-8):     Pythonowe API do dostępu do plików logów flowd
 Group:         Applications/Networking
-Obsoletes:     python-flowd
+Obsoletes:     flowd-python
 
 %description -n python-flowd
 This is a Python API to the binary flowd network flow log format and
@@ -101,13 +103,13 @@ sieciowych flowd.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
 %{__make}
 
-CFLAGS="%{rpmcflags}" \
-%{__python} setup.py build
+%py_build
 
 cd Flowd-perl
 %{__perl} Makefile.PL \
@@ -132,9 +134,7 @@ install -p flowd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/flowd
 rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Flowd/.packlist
 
 # Python module
-%{__python} setup.py install \
-       --optimize=2 \
-       --root=$RPM_BUILD_ROOT
+%py_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -175,7 +175,6 @@ fi
 %doc reader.pl
 %{perl_vendorarch}/Flowd.pm
 %dir %{perl_vendorarch}/auto/Flowd
-%{perl_vendorarch}/auto/Flowd/Flowd.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Flowd/Flowd.so
 %{_mandir}/man3/Flowd.3pm*