packages: ulogd/ulogd.spec - removed bogus -devel package - fixed autotools...

Sun Jun 24 09:18:05 CEST 2012

Author: qboosh                       Date: Sun Jun 24 07:18:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed bogus -devel package
- fixed autotools rebuild
- updated versioned dependencies
- build and package ulogd.html

---- Files affected:
packages/ulogd:
   ulogd.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: packages/ulogd/ulogd.spec
diff -u packages/ulogd/ulogd.spec:1.52 packages/ulogd/ulogd.spec:1.53

--- packages/ulogd/ulogd.spec:1.52	Thu Jun 21 09:15:55 2012
+++ packages/ulogd/ulogd.spec	Sun Jun 24 09:18:00 2012
@@ -1,11 +1,10 @@
 # $Revision$, $Date$
-%define		beta	beta4
 Summary:	ULOGD - the Userspace Logging Daemon for iptables
 Summary(pl.UTF-8):	Demon logujący w trybie użytkownika dla iptables
 Name:		ulogd
 Version:	2.0.0
 Release:	0.1
-License:	GPL
+License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://ftp.netfilter.org/pub/ulogd/%{name}-%{version}.tar.bz2
 # Source0-md5:	211e68781e3860959606fc94b97cf22e
@@ -15,22 +14,29 @@
 Patch0:		%{name}-includes.patch
 Patch1:		%{name}-ac.patch
 URL:		http://netfilter.org/projects/ulogd/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	libdbi-devel
+BuildRequires:	libmnl-devel >= 1.0.0
 BuildRequires:	libnetfilter_acct-devel >= 1.0.0
-BuildRequires:	libnetfilter_conntrack-devel >= 0.0.95
-BuildRequires:	libnetfilter_log-devel >= 0.0.15
-BuildRequires:	libnfnetlink-devel >= 0.0.39
+BuildRequires:	libnetfilter_conntrack-devel >= 1.0.0
+BuildRequires:	libnetfilter_log-devel >= 1.0.0
+BuildRequires:	libnfnetlink-devel >= 1.0.0
 BuildRequires:	libpcap-devel
+BuildRequires:	libtool
 BuildRequires:	mysql-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel
+BuildRequires:	sgml-tools
+BuildRequires:	sqlite3-devel >= 3
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires:	iptables
-#Requires:	kernel >= 2.4.0test9
+Requires:	libmnl >= 1.0.0
+Requires:	libnetfilter_acct >= 1.0.0
+Requires:	libnetfilter_conntrack >= 1.0.0
+Requires:	libnetfilter_log >= 1.0.0
+Requires:	libnfnetlink >= 1.0.0
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,22 +56,11 @@
   - wysłać pakiet poprzez netlink
   - zwrócić natychmiast NF_CONTINUE.
 
-%package devel
-Summary:	Header files for %{name}
-Summary(pl.UTF-8):	Pliki nagłówkowe %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Header files for %{name}.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe %{name}.
-
 %package dbi
 Summary:	DBI plugin for ulogd
 Summary(pl.UTF-8):	Wtyczka DBI dla ulogd
 Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description dbi
 DBI plugin for ulogd.
@@ -78,6 +73,7 @@
 Summary(pl.UTF-8):	Wtyczka MySQL dla ulogd
 Group:		Networking/Daemons
 Obsoletes:	iptables-ulogd-mysql
+Requires:	%{name} = %{version}-%{release}
 
 %description mysql
 MySQL plugin for ulogd.
@@ -89,6 +85,7 @@
 Summary:	PCAP plugin for ulogd
 Summary(pl.UTF-8):	Wtyczka PCAP dla ulogd
 Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description pcap
 PCAP plugin for ulogd.
@@ -100,6 +97,7 @@
 Summary:	PostgreSQL plugin for ulogd
 Summary(pl.UTF-8):	Wtyczka PostgreSQL dla ulogd
 Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description pgsql
 PostgreSQL plugin for ulogd.
@@ -111,6 +109,7 @@
 Summary:	SQLite plugin for ulogd
 Summary(pl.UTF-8):	Wtyczka SQLite dla ulogd
 Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
 
 %description sqlite
 SQLite plugin for ulogd.
@@ -124,18 +123,22 @@
 %patch1 -p0
 
 %build
-#%if "%{_lib}" != "lib"
-#sed -e 's at lib/@%{_lib}/@g' -i configure.in
-#%endif
-
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+	--disable-silent-rules \
 	--with-dbi \
 	--with-dbi-lib=%{_libdir} \
 	--with-mysql \
 	--with-pgsql
 %{__make} -j1
 
+cd doc
+sgml2html -s 0 ulogd.sgml
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},/etc/{sysconfig,logrotate.d,rc.d/init.d,ulogd}} \
@@ -148,7 +151,8 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ulogd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/ulogd
 install %{name}.conf $RPM_BUILD_ROOT/etc/%{name}.conf
-install -D %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ulogd/*.la
 
 touch $RPM_BUILD_ROOT/var/log/ulogd{,.pktlog}
 
@@ -172,14 +176,14 @@
 
 %files
 %defattr(644,root,root,755)
-#%doc Changes doc/*.{ps,txt,html}
+%doc AUTHORS README TODO doc/ulogd.html
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ulogd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ulogd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ulogd
 %attr(750,root,root) %dir %{_sysconfdir}/ulogd
 %attr(754,root,root) /etc/rc.d/init.d/ulogd
 
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/ulogd
 %dir %{_libdir}/ulogd
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_HWHDR.so
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_filter_IFINDEX.so
@@ -203,12 +207,9 @@
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_output_XML.so
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_raw2packet_BASE.so
 
-%attr(640,root,root) %ghost /var/log/*
-%{_mandir}/man8/%{name}.*
-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/ulogd/*.la
+%attr(640,root,root) %ghost /var/log/ulogd
+%attr(640,root,root) %ghost /var/log/ulogd.pktlog
+%{_mandir}/man8/ulogd.8*
 
 %files dbi
 %defattr(644,root,root,755)
@@ -216,7 +217,7 @@
 
 %files mysql
 %defattr(644,root,root,755)
-%doc doc/mysql*
+%doc doc/mysql*.sql
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_output_MYSQL.so
 
 %files pcap
@@ -225,12 +226,12 @@
 
 %files pgsql
 %defattr(644,root,root,755)
-%doc doc/pgsql*
+%doc doc/pgsql*.sql
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_output_PGSQL.so
 
 %files sqlite
 %defattr(644,root,root,755)
-%doc doc/sqlite*
+%doc doc/sqlite3.table
 %attr(755,root,root) %{_libdir}/ulogd/ulogd_output_SQLITE3.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -239,6 +240,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2012/06/24 07:18:00  qboosh
+- removed bogus -devel package
+- fixed autotools rebuild
+- updated versioned dependencies
+- build and package ulogd.html
+
 Revision 1.52  2012/06/21 07:15:55  paszczus
 - merged from Titanium branch, final 2.0.0 version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ulogd/ulogd.spec?r1=1.52&r2=1.53

