- adapterized

Changed files:
    barnyard2.spec -> 1.2

diff --git a/barnyard2.spec b/barnyard2.spec
index 602938db520782b8db0dcba3a9d12f632582f7fa..1ef51b464514d72491984e51501f541f9368d8d4 100644 (file)
--- a/barnyard2.spec
+++ b/barnyard2.spec
@@ -19,20 +19,19 @@ URL:                https://github.com/firnsy/barnyard2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Barnyard has 3 modes of operation:
-One-shot, continual, continual w/ checkpoint.  In one-shot mode,
-barnyard will process the specified file and exit.  In continual mode,
-barnyard will start with the specified file and continue to process
-new data (and new spool files) as it appears.  Continual mode w/
-checkpointing will also use a checkpoint 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.
+Barnyard has 3 modes of operation: One-shot, continual, continual w/
+checkpoint. In one-shot mode, barnyard will process the specified file
+and exit. In continual mode, barnyard will start with the specified
+file and continue to process new data (and new spool files) as it
+appears. Continual mode w/ checkpointing will also use a checkpoint
+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-barnyard2-5832a85
+%setup -q -n firnsy-%{name}-5832a85
 
 
 %build
@@ -49,14 +48,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__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%{_mandir}/man8
-%{__install} -d -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc
-%{__install} -m 644 etc/barnyard2.conf $RPM_BUILD_ROOT%{_sysconfdir}/snort/
-%{__install} -m 644 $RPM_SOURCE_DIR/barnyard2.config $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/barnyard2
-%{__install} -m 755 $RPM_SOURCE_DIR/barnyard2 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/barnyard2
-%{__install} -m 644 doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/doc/
+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%{_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/
 
 %clean
 if [ -d $RPM_BUILD_ROOT ] && [ "$RPM_BUILD_ROOT" != "/"  ] ; then
@@ -68,5 +67,5 @@ fi
 %doc LICENSE doc/
 %attr(755,root,root) %{_bindir}/barnyard2
 %attr(640,root,root) %config %{_sysconfdir}/snort/barnyard2.conf
-%attr(755,root,root) %config %{_sysconfdir}/rc.d/init.d/barnyard2
-%attr(644,root,root) %config %{_sysconfdir}/sysconfig/barnyard2
+%attr(754,root,root) %config /etc/rc.d/init.d/barnyard2
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/barnyard2