Merge pull request #27 from basepi/fixup

Fix the rpm spec changelog order, rev to v2.1.2
hubblestack · Feb 13, 2017 · e053e03 · e053e03
2 parents 8ff4d45 + 9a5f4c1
commit e053e03
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git 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
@@ -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 <<EOF >~/.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
@@ -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 <[email protected]> 2.1.0-1
-- First Build
+* Mon Feb 13 2017  Colton Myers <[email protected]> 2.1.2-1
+- Fix the changelog order
 
 * Mon Feb 13 2017  Colton Myers <[email protected]> 2.1.1-1
 - Remove autoreq, add unit files
+
+* Wed Feb 8 2017  Colton Myers <[email protected]> 2.1.0-1
+- First Build
diff --git 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 <[email protected]> 2.1.0-1
-- First Build
+* Mon Feb 13 2017  Colton Myers <[email protected]> 2.1.2-1
+- Fix the changelog order
 
 * Mon Feb 13 2017  Colton Myers <[email protected]> 2.1.1-1
 - Remove autoreq, add unit files
+
+* Wed Feb 8 2017  Colton Myers <[email protected]> 2.1.0-1
+- First Build