packages: barnyard2/barnyard2.spec - callout autotools from spec, include p...

[glen]

Author: glen                         Date: Thu Oct 27 15:50:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- callout autotools from spec, include progs in BR
- cleanup install dirs, skip duplicate doc packaging

---- Files affected:
packages/barnyard2:
   barnyard2.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/barnyard2/barnyard2.spec
diff -u packages/barnyard2/barnyard2.spec:1.3 packages/barnyard2/barnyard2.spec:1.4
--- packages/barnyard2/barnyard2.spec:1.3	Thu Oct 27 17:46:37 2011
+++ packages/barnyard2/barnyard2.spec	Thu Oct 27 17:50:17 2011
@@ -17,6 +17,9 @@
 Source2:	%{name}.config
 Source3:	%{name}
 URL:		https://github.com/firnsy/barnyard2
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
 %{?with_mysql:BuildRequires:		mysql-devel}
 %{?with_postgresql:BuildRequires:	postgresql-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,7 +42,11 @@
 mv firnsy-%{name}-*/* .
 
 %build
-./autogen.sh
+%{__aclocal} -I m4
+%{__libtoolize}
+%{__autoconf}
+%{__autoheader}
+%{__automake} --force-missing
 %configure \
 	--sysconfdir=%{_sysconfdir}/snort \
 	%{?with_postgresql:--with-postgresql} \
@@ -53,14 +60,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d -p $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
-install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/snort
-install -d -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{doc,contrib}
-install -d -p $RPM_BUILD_ROOT%{_mandir}/man8
+install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sysconfdir}/snort}
 cp -p etc/barnyard2.conf $RPM_BUILD_ROOT%{_sysconfdir}/snort
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/barnyard2
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/barnyard2
-cp -p doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,6 +82,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/10/27 15:50:17  glen
+- callout autotools from spec, include progs in BR
+- cleanup install dirs, skip duplicate doc packaging
+
 Revision 1.3  2011/10/27 15:46:37  glen
 - avoid epoch bump when 1.10 release is made (move beta component to release)
 - /etc/{sysconfig,rc.d/init.d} may not macroized with sysconfdir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/barnyard2/barnyard2.spec?r1=1.3&r2=1.4&f=u