Merge pull request #34 from jelu/release/0.05

Release 0.05

Author: jelu

Changes

@@ -1,5 +1,13 @@
 Revision history for App::DSC::DataTool
 
+0.05    2019-05-31
+        Release 0.05
+
+        Fixed issue with empty values in InfluxDB output, they are now
+        quoted as an empty string.
+
+        9917c4e InfluxDB quote keys/values
+
 0.04    2019-01-21
         Release 0.04
 

debian/changelog

@@ -1,3 +1,14 @@
+dsc-datatool (0.05-1~unstable+1) unstable; urgency=low
+
+  * Release 0.05
+
+    Fixed issue with empty values in InfluxDB output, they are now
+    quoted as an empty string.
+
+    9917c4e InfluxDB quote keys/values
+
+ -- Jerry Lundström <lundstrom.jerry@gmail.com>  Fri, 31 May 2019 08:44:19 +0200
+
 dsc-datatool (0.04-1~unstable+1) unstable; urgency=low
 
   * Release 0.04

lib/App/DSC/DataTool.pm

@@ -10,11 +10,11 @@ App::DSC::DataTool - Export DSC data to other formats and/or databases
 
 =head1 VERSION
 
-Version 0.04
+Version 0.05
 
 =cut
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 =head1 SYNOPSIS
 

rpm/dsc-datatool.spec

@@ -1,5 +1,5 @@
 Name:           dsc-datatool
-Version:        0.04
+Version:        0.05
 Release:        1%{?dist}
 Summary:        Export DSC data to other formats and/or databases
 Group:          Productivity/Networking/DNS/Utilities
@@ -13,7 +13,14 @@ Source0:        %{name}_%{version}.orig.tar.gz
 BuildArch:      noarch
 
 BuildRequires:  perl
+%if 0%{?suse_version} || 0%{?sle_version}
 BuildRequires:  perl-macros
+%else
+BuildRequires:  perl-macros
+BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker)
+%endif
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::CheckManifest) >= 0.9
 BuildRequires:  perl(common::sense) >= 3
@@ -40,27 +47,77 @@ Tool for converting, exporting, merging and transforming DSC data.
 
 
 %build
+%if 0%{?suse_version} || 0%{?sle_version}
 %{__perl} Makefile.PL
+%else
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%endif
 make %{?_smp_mflags}
 
 
 %install
+%if 0%{?suse_version} || 0%{?sle_version}
 %perl_make_install
 find %buildroot/%_prefix -name *.bs -a -size 0 | xargs rm -f
 %perl_process_packlist
 %perl_gen_filelist
+%else
+%{__make} pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+%{_fixperms} -c %{buildroot}
+%endif
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%if 0%{?suse_version} || 0%{?sle_version}
 %files -f %{name}.files
 %defattr(-,root,root)
 %doc Changes LICENSE README.md
+%else
+%files
+%license LICENSE
+%doc Changes README.md
+%{_bindir}/dsc-datatool
+%{perl_vendorlib}/App/DSC/DataTool.pm
+%{perl_vendorlib}/App/DSC/DataTool/
+%{_mandir}/man1/dsc-datatool.1.gz
+%{_mandir}/man3/App::DSC::DataTool.3*
+%{_mandir}/man3/App::DSC::DataTool::Dataset.3*
+%{_mandir}/man3/App::DSC::DataTool::Dataset::Dimension.3*
+%{_mandir}/man3/App::DSC::DataTool::Error.3*
+%{_mandir}/man3/App::DSC::DataTool::Errors.3*
+%{_mandir}/man3/App::DSC::DataTool::Generator.3*
+%{_mandir}/man3/App::DSC::DataTool::Generator::client_ports_count.3*
+%{_mandir}/man3/App::DSC::DataTool::Generator::client_subnet_authority.3*
+%{_mandir}/man3/App::DSC::DataTool::Generator::client_subnet_country.3*
+%{_mandir}/man3/App::DSC::DataTool::Generators.3*
+%{_mandir}/man3/App::DSC::DataTool::Input.3*
+%{_mandir}/man3/App::DSC::DataTool::Input::DAT.3*
+%{_mandir}/man3/App::DSC::DataTool::Input::XML.3*
+%{_mandir}/man3/App::DSC::DataTool::Inputs.3*
+%{_mandir}/man3/App::DSC::DataTool::Log.3*
+%{_mandir}/man3/App::DSC::DataTool::Output.3*
+%{_mandir}/man3/App::DSC::DataTool::Output::Carbon.3*
+%{_mandir}/man3/App::DSC::DataTool::Output::InfluxDB.3*
+%{_mandir}/man3/App::DSC::DataTool::Outputs.3*
+%{_mandir}/man3/App::DSC::DataTool::Transformer.3*
+%{_mandir}/man3/App::DSC::DataTool::Transformer::Labler.3*
+%{_mandir}/man3/App::DSC::DataTool::Transformer::NetRemap.3*
+%{_mandir}/man3/App::DSC::DataTool::Transformer::ReRanger.3*
+%{_mandir}/man3/App::DSC::DataTool::Transformers.3*
+%endif
 
 
 %changelog
+* Fri May 31 2019 Jerry Lundström <lundstrom.jerry@gmail.com> 0.05-1
+- Release 0.05
+  * Fixed issue with empty values in InfluxDB output, they are now
+    quoted as an empty string.
+  * Commits:
+    9917c4e InfluxDB quote keys/values
 * Mon Jan 21 2019 Jerry Lundström <lundstrom.jerry@gmail.com> 0.04-1
 - Release 0.04
   * Package dependency fix and update of example Grafana dashboards.