packages: barnyard2/barnyard2.spec - avoid epoch bump when 1.10 release is ...
glen
glen at pld-linux.org
Thu Oct 27 17:46:42 CEST 2011
Author: glen Date: Thu Oct 27 15:46:42 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 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
- cleanup clean
- config noreplace and verify not attrs for config file
- undepend on github hash in prep
- normalize tarball name for distfiles
---- Files affected:
packages/barnyard2:
barnyard2.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/barnyard2/barnyard2.spec
diff -u packages/barnyard2/barnyard2.spec:1.2 packages/barnyard2/barnyard2.spec:1.3
--- packages/barnyard2/barnyard2.spec:1.2 Thu Oct 27 07:18:46 2011
+++ packages/barnyard2/barnyard2.spec Thu Oct 27 17:46:37 2011
@@ -4,13 +4,15 @@
%bcond_without mysql # don't build support for MySQL
%bcond_without postgresql # don't build support for PostgreSQL
+%define subver beta2
+%define rel 1
Summary: Snort Log Backend
Name: barnyard2
-Version: 1.10beta2
-Release: 1
+Version: 1.10
+Release: 0.%{subver}.%{rel}
License: GPL
Group: Networking
-Source0: https://github.com/firnsy/barnyard2/tarball/v2-1.10-beta2
+Source0: https://github.com/firnsy/barnyard2/tarball/v2-%{version}-%{subver}/%{name}-%{version}.tar.gz
# Source0-md5: af417a3491c5a4e5605c8fbd529f2255
Source2: %{name}.config
Source3: %{name}
@@ -28,18 +30,20 @@
file (or waldo file in the snort world) to track where it is. In the
event the barnyard process ends while a waldo file is in use, barnyard
will resume processing at the last entry as listed in the waldo file.
+
%{?with_mysql:barnyard2 binary compiled with mysql support.}
%{?with_postgresql:barnyard2 binary compiled with postgresql support.}
%prep
-%setup -q -n firnsy-%{name}-5832a85
-
+%setup -qc
+mv firnsy-%{name}-*/* .
%build
./autogen.sh
-%configure --sysconfdir=%{_sysconfdir}/snort \
+%configure \
+ --sysconfdir=%{_sysconfdir}/snort \
%{?with_postgresql:--with-postgresql} \
- %{?with_mysql:--with-mysql-libraries=/usr/%{_lib}} \
+ %{?with_mysql:--with-mysql-libraries=%{_libdir}} \
%{__make}
@@ -49,27 +53,25 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -d -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d,snort}
-install -d -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/contrib
+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 -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc
-install etc/barnyard2.conf $RPM_BUILD_ROOT%{_sysconfdir}/snort/
-install $RPM_SOURCE_DIR/barnyard2.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2
-install $RPM_SOURCE_DIR/barnyard2 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2
-install doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc/
+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
-if [ -d $RPM_BUILD_ROOT ] && [ "$RPM_BUILD_ROOT" != "/" ] ; then
- rm -rf $RPM_BUILD_ROOT
-fi
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE doc/
-%attr(755,root,root) %{_bindir}/barnyard2
-%attr(640,root,root) %config %{_sysconfdir}/snort/barnyard2.conf
-%attr(754,root,root) %config /etc/rc.d/init.d/barnyard2
+%doc LICENSE doc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/snort/barnyard2.conf
+%attr(754,root,root) /etc/rc.d/init.d/barnyard2
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/barnyard2
+%attr(755,root,root) %{_bindir}/barnyard2
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -77,9 +79,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
+- cleanup clean
+- config noreplace and verify not attrs for config file
+- undepend on github hash in prep
+- normalize tarball name for distfiles
+
Revision 1.2 2011/10/27 05:18:46 mguevara
- adapterized
Revision 1.1 2011/10/24 22:52:35 mguevara
- initial release - barnyard2 is an output processor for snort
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/barnyard2/barnyard2.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list