ulogd-2.0.7-1

u/ulogd/ulogd-vl.spec

@@ -1,20 +1,25 @@
+%bcond_with doc
+
 Summary: Userspace logging daemon for netfilter
 Name: ulogd
-Version: 2.0.5
+Version: 2.0.7
 Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.netfilter.org/projects/%{name}/
 Source0: http://ftp.netfilter.org/pub/%{name}/%{name}-%{version}.tar.bz2
 Source1: %{name}.init
+Source2: %{name}.logrotate
 
 BuildRequires: libnetfilter_conntrack-devel >= 0.0.95
 BuildRequires: libnetfilter_log-devel >= 1.0.0
 BuildRequires: libnfnetlink-devel >= 0.0.39
 BuildRequires: libnetfilter_acct-devel >= 1.0.1 
 BuildRequires: libmnl-devel
+%if %{with doc}
 BuildRequires: linuxdoc-tools
 BuildRequires: texlive-collection-fontsrecommended
+%endif
 
 Requires(post): /sbin/service
 Requires(post): /sbin/chkconfig
@@ -45,7 +50,7 @@ firewall information through a libdbi interface.
 %package mysql
 Summary: MySQL output plugin for %{name}
 Group: System Environment/Daemons
-BuildRequires: libmysqlclient-devel
+BuildRequires: libmariadb-devel
 Requires: %{name} = %{version}
 %description mysql
 %{name}-mysql is a MySQL output plugin for %{name}. It enables logging of
@@ -84,9 +89,6 @@ firewall information into an SQLITE database.
 
 %{__sed} -i -e 's|/var/log/|%{_localstatedir}/log/%{name}/|g' %{name}.conf.in
 
-%{__sed} -i -e 's|/var/log/|%{_localstatedir}/log/%{name}/|g' %{name}.logrotate
-%{__sed} -i -e 's|/bin/killall|%{_bindir}/killall|g' %{name}.logrotate
-
 %build
 %configure \
    --disable-static \
@@ -96,7 +98,9 @@ firewall information into an SQLITE database.
    --with-sqlite3-lib=%{_libdir}
 
 %{__make} %{?_smp_mflags}
+%if %{with doc}
 %{__make} %{?_smp_mflags} -C doc
+%endif
 
 %install
 %{__rm} -rf %{buildroot}
@@ -108,7 +112,7 @@ firewall information into an SQLITE database.
 %{__install} -m 0644 %{name}.conf %{buildroot}%{_sysconfdir}/
 
 %{__mkdir_p} -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d/
-%{__install} -m 0644 %{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 %{__mkdir_p} -m 0755 %{buildroot}%{_initrddir}/
 %{__install} -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
@@ -142,9 +146,11 @@ fi
 %{_initrddir}/%{name}
 %{_libdir}/%{name}
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 %doc AUTHORS README
+%if %{with doc}
 %doc doc/%{name}.txt doc/%{name}.ps doc/%{name}.html
+%endif
 %doc %{_mandir}/man?/*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -160,33 +166,38 @@ fi
 %defattr(0755,root,root,0755)
 %{_libdir}/%{name}/%{name}_output_DBI.so
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 
 %files mysql
 %defattr(0755,root,root,0755)
 %{_libdir}/%{name}/%{name}_output_MYSQL.so
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 
 %files pgsql
 %defattr(0755,root,root,0755)
 %{_libdir}/%{name}/%{name}_output_PGSQL.so
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 
 %files pcap
 %defattr(0755,root,root,0755)
 %{_libdir}/%{name}/%{name}_output_PCAP.so
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 
 %files sqlite
 %defattr(0755,root,root,0755)
 %{_libdir}/%{name}/%{name}_output_SQLITE3.so
 %defattr(0644,root,root,0755)
-%doc COPYING
+%license COPYING
 
 %changelog
+* Sun Aug 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.7-1
+- new upstream release.
+- added Source2: dropped in upstream.
+- disabled to build documents: raised tooooo many errors.
+
 * Sun Feb 25 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.5-1
 - new upstream release.