From 9a5f4c182bf05b74519f9e8f32a281dab2e76723 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Mon, 13 Feb 2017 15:58:54 -0700 Subject: [PATCH] Fix the rpm spec changelog order, rev to v2.1.2 --- hubblestack/__init__.py | 2 +- pkg/build_rpms.sh | 22 +++++++++++----------- pkg/specs/hubblestack-el6.spec | 9 ++++++--- pkg/specs/hubblestack-el7.spec | 9 ++++++--- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/hubblestack/__init__.py b/hubblestack/__init__.py index 55fa725bd..f81156126 100644 --- a/hubblestack/__init__.py +++ b/hubblestack/__init__.py @@ -1 +1 @@ -__version__ = '2.1.1' +__version__ = '2.1.2' diff --git a/pkg/build_rpms.sh b/pkg/build_rpms.sh index 6843c532a..7d25ecd6c 100755 --- a/pkg/build_rpms.sh +++ b/pkg/build_rpms.sh @@ -17,17 +17,17 @@ cd .. bash init_pkg.sh -y cp hubble.tar.gz ~/hubble.tar.gz -rm -rf ~/hubblestack-2.1.1 -rm -rf ~/hubblestack-2.1.1.tar.gz -mkdir ~/hubblestack-2.1.1 -tar -xzvf ~/hubble.tar.gz -C ~/hubblestack-2.1.1 -mkdir -p ~/hubblestack-2.1.1/etc/init.d -cp pkg/hubble ~/hubblestack-2.1.1/etc/init.d -mkdir -p ~/hubblestack-2.1.1/usr/lib/systemd/system -cp pkg/hubble.service ~/hubblestack-2.1.1/usr/lib/systemd/system -cp -f conf/hubble ~/hubblestack-2.1.1/etc/hubble/hubble +rm -rf ~/hubblestack-2.1.2 +rm -rf ~/hubblestack-2.1.2.tar.gz +mkdir ~/hubblestack-2.1.2 +tar -xzvf ~/hubble.tar.gz -C ~/hubblestack-2.1.2 +mkdir -p ~/hubblestack-2.1.2/etc/init.d +cp pkg/hubble ~/hubblestack-2.1.2/etc/init.d +mkdir -p ~/hubblestack-2.1.2/usr/lib/systemd/system +cp pkg/hubble.service ~/hubblestack-2.1.2/usr/lib/systemd/system +cp -f conf/hubble ~/hubblestack-2.1.2/etc/hubble/hubble cd ~ -tar -czvf hubblestack-2.1.1.tar.gz hubblestack-2.1.1/ +tar -czvf hubblestack-2.1.2.tar.gz hubblestack-2.1.2/ rm -rf ~/rpmbuild mkdir -p ~/rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp} @@ -36,7 +36,7 @@ cat <~/.rpmmacros %_tmppath %{_topdir}/tmp EOF -cp ~/hubblestack-2.1.1.tar.gz ~/rpmbuild/SOURCES/ +cp ~/hubblestack-2.1.2.tar.gz ~/rpmbuild/SOURCES/ cd ~/rpmbuild cp ~/hubble/pkg/specs/* SPECS/ diff --git a/pkg/specs/hubblestack-el6.spec b/pkg/specs/hubblestack-el6.spec index 528db14d7..245b3d045 100644 --- a/pkg/specs/hubblestack-el6.spec +++ b/pkg/specs/hubblestack-el6.spec @@ -9,7 +9,7 @@ Summary: Hubblestack is a module, open-source security compliance framework Name: hubblestack -Version: 2.1.1 +Version: 2.1.2 Release: 1 License: Apache 2.0 Group: Development/Tools @@ -53,8 +53,11 @@ rm -rf %{buildroot} /usr/bin/* %changelog -* Wed Feb 8 2017 Colton Myers 2.1.0-1 -- First Build +* Mon Feb 13 2017 Colton Myers 2.1.2-1 +- Fix the changelog order * Mon Feb 13 2017 Colton Myers 2.1.1-1 - Remove autoreq, add unit files + +* Wed Feb 8 2017 Colton Myers 2.1.0-1 +- First Build diff --git a/pkg/specs/hubblestack-el7.spec b/pkg/specs/hubblestack-el7.spec index 4a504b831..5c77cbedd 100644 --- a/pkg/specs/hubblestack-el7.spec +++ b/pkg/specs/hubblestack-el7.spec @@ -9,7 +9,7 @@ Summary: Hubblestack is a module, open-source security compliance framework Name: hubblestack -Version: 2.1.1 +Version: 2.1.2 Release: 1 License: Apache 2.0 Group: Development/Tools @@ -53,8 +53,11 @@ rm -rf %{buildroot} /usr/lib/* %changelog -* Wed Feb 8 2017 Colton Myers 2.1.0-1 -- First Build +* Mon Feb 13 2017 Colton Myers 2.1.2-1 +- Fix the changelog order * Mon Feb 13 2017 Colton Myers 2.1.1-1 - Remove autoreq, add unit files + +* Wed Feb 8 2017 Colton Myers 2.1.0-1 +- First Build