Merge pull request #54 from piersc/spec_update

Prepare for 0.13 release

NEWS

@@ -1,5 +1,11 @@
 configsnap NEWS
 
+0.13
+ * New option -a to create a tar archive of the output
+ * New option -w to overwrite existing output
+ * PEP8 fixes
+ * Modify check for PHP presence
+
 0.12
  * Record Pacemaker status
  * Don't raise exception if command doesn't exist

README.md

@@ -7,10 +7,14 @@ Tested on RHEL, CentOS, Fedora and Ubuntu, but should also work on other derivat
 ```
 Usage: configsnap [options]
 
+Record useful system state information, and compare to previous state if run
+with PHASE containing "post" or "rollback".
+
 Options:
   -h, --help            show this help message and exit
   -w, --overwrite       if tag dir already exists, remove previously collected
                         data
+  -a, --archive         pack output files into a tar archive
   -v, --verbose         print debug info
   -V, --version         print version
   -s, --silent          no output to stdout

configsnap

@@ -29,7 +29,7 @@ import shutil
 import tarfile
 
 
-version = "0.12"
+version = "0.13"
 diffs_found_msg = False
 is_php_detected = False
 

configsnap.spec

@@ -1,5 +1,5 @@
 Name:          configsnap
-Version:       0.12
+Version:       0.13
 Release:       1%{?dist}
 Summary:       Record and compare system state
 License:       ASL 2.0
@@ -20,10 +20,10 @@ with a previous state and identify changes
 help2man --include=%{name}.help2man --no-info ./%{name} -o %{name}.man
 
 %install
-mkdir -p %{buildroot}%{_bindir} \
+mkdir -p %{buildroot}%{_sbindir} \
   %{buildroot}%{_mandir}/man1 \
   %{buildroot}%{_sysconfdir}/%{name}
-install -p -m 0755 %{name} %{buildroot}%{_bindir}
+install -p -m 0755 %{name} %{buildroot}%{_sbindir}
 install -p -m 0644 %{name}.man %{buildroot}%{_mandir}/man1/%{name}.1
 install -p -m 0600 additional.conf %{buildroot}%{_sysconfdir}/%{name}/additional.conf
 
@@ -34,11 +34,18 @@ install -p -m 0600 additional.conf %{buildroot}%{_sysconfdir}/%{name}/additional
 %doc README.md
 %doc NEWS
 %doc MAINTAINERS.md
+%config(noreplace) %{_sysconfdir}/%{name}/additional.conf
 %{_mandir}/man1/%{name}.1*
-%{_bindir}/%{name}
+%{_sbindir}/%{name}
 %{_sysconfdir}/%{name}
 
 %changelog
+* Thu Aug 17 2017 Piers Cornwell <[email protected]> 0.13.1
+- New option -a to create a tar archive of the output
+- New option -w to overwrite existing output
+- PEP8 fixes
+- Modify check for PHP presence
+
 * Mon Jun 12 2017 Piers Cornwell <[email protected]> 0.12-1
 - Record Pacemaker status
 - Don't raise exception if command doesn't exist

debian/configsnap.install

@@ -1 +1 @@
-configsnap /usr/bin
+configsnap /usr/sbin