Updating python sitelib for IUS packages

StackStorm · Sep 4, 2015 · a189095 · a189095
1 parent 99d663f
commit a189095
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 24 deletions.
diff --git a/st2actions/packaging/rpm/st2actions-rhel6.spec b/st2actions/packaging/rpm/st2actions-rhel6.spec
@@ -11,6 +11,8 @@ Vendor: StackStorm
 Packager: Estee Tew <st2@stackstorm.com>
 Requires:     st2common
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -23,16 +25,16 @@ sed -i -r "s~logs~/var/log/st2~g" conf/*log*.conf
 %install
 
 mkdir -p %{buildroot}/etc/st2actions
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/usr/bin
-cp -R st2actions %{buildroot}/usr/local/lib/python2.7/site-packages/
+cp -R st2actions %{buildroot}%{python2_sitelib}/
 cp -R conf/* %{buildroot}/etc/st2actions
 install -m755 bin/st2actionrunner %{buildroot}/usr/bin/st2actionrunner
 install -m755 bin/st2resultstracker %{buildroot}/usr/bin/st2resultstracker
 install -m755 bin/st2notifier %{buildroot}/usr/bin/st2notifier
 %files
 
-/usr/local/lib/python2.7/site-packages/st2actions*
+/usr/lib/python2.7/site-packages/st2actions*
 /usr/bin/st2actionrunner
 /usr/bin/st2resultstracker
 /usr/bin/st2notifier

diff --git a/st2api/packaging/rpm/st2api-rhel6.spec b/st2api/packaging/rpm/st2api-rhel6.spec
@@ -11,6 +11,8 @@ Vendor: StackStorm
 Packager: Estee Tew <st2@stackstorm.com>
 Requires:       st2common
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -23,14 +25,14 @@ sed -i -r "s~logs~/var/log/st2~g" conf/logging.conf
 %install
 
 mkdir -p %{buildroot}/etc/st2api
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages/
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/usr/bin
-cp -R st2api %{buildroot}/usr/local/lib/python2.7/site-packages/
+cp -R st2api %{buildroot}%{python2_sitelib}/
 cp -R conf/* %{buildroot}/etc/st2api
 install -m755 bin/st2api %{buildroot}/usr/bin/st2api
 
 %files
 
-/usr/local/lib/python2.7/site-packages/st2api*
+/usr/lib/python2.7/site-packages/st2api*
 /usr/bin/st2api
 /etc/st2api*
diff --git a/st2auth/packaging/rpm/st2auth-rhel6.spec b/st2auth/packaging/rpm/st2auth-rhel6.spec
@@ -11,6 +11,8 @@ Vendor: StackStorm
 Packager: Estee Tew <st2@stackstorm.com>
 Requires:       st2common
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -23,14 +25,14 @@ sed -i -r "s~logs~/var/log/st2~g" conf/logging.conf
 %install
 
 mkdir -p %{buildroot}/etc/st2auth
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages/
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/usr/bin
-cp -R st2auth %{buildroot}/usr/local/lib/python2.7/site-packages/
+cp -R st2auth %{buildroot}%{python2_sitelib}/
 cp -R conf/* %{buildroot}/etc/st2auth
 install -m755 bin/st2auth %{buildroot}/usr/bin/st2auth
 
 %files
 
-/usr/local/lib/python2.7/site-packages/st2auth*
+/usr/lib/python2.7/site-packages/st2auth*
 /usr/bin/st2auth
 /etc/st2auth*
diff --git a/st2common/packaging/rpm/st2common-rhel6.spec b/st2common/packaging/rpm/st2common-rhel6.spec
@@ -14,6 +14,8 @@ Requires:   	python-pip
 Requires:     mongodb
 Requires:     mongodb-server
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -26,30 +28,34 @@ An automation plaform that needs a much better description than this.
 %install
 
 mkdir -p %{buildroot}/usr/bin
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages/
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/var/log/st2
 mkdir -p %{buildroot}/etc/st2
 mkdir -p %{buildroot}/etc/logrotate.d
 mkdir -p %{buildroot}/opt/stackstorm/packs
+mkdir -p %{buildroot}/opt/stackstorm/packs/default
+mkdir -p %{buildroot}/opt/stackstorm/packs/default/actions
+mkdir -p %{buildroot}/opt/stackstorm/packs/default/sensors
+mkdir -p %{buildroot}/opt/stackstorm/packs/default/rules
 mkdir -p %{buildroot}/usr/share/doc/st2
-cp -R contrib/default %{buildroot}/opt/stackstorm/packs/
+mkdir -p %{buildroot}/usr/share/stackstorm
 cp -R contrib/core %{buildroot}/opt/stackstorm/packs/
 cp -R contrib/packs %{buildroot}/opt/stackstorm/packs/
 cp -R contrib/linux %{buildroot}/opt/stackstorm/packs/
 cp -R contrib/examples %{buildroot}/usr/share/doc/st2/
 cp -R docs/* %{buildroot}/usr/share/doc/st2/
-cp -R st2common %{buildroot}//usr/local/lib/python2.7/site-packages/
-cp -R bin %{buildroot}/usr/local/lib/python2.7/site-packages/st2common/
+cp -R st2common %{buildroot}/%{python2_sitelib}/
+cp -R bin %{buildroot}/%{python2_sitelib}/st2common/
 install st2/st2.conf %{buildroot}/etc/st2/st2.conf
 install logrotate.d/st2.conf %{buildroot}/etc/logrotate.d/st2.conf
 install -m755 tools/st2ctl %{buildroot}/usr/bin/st2ctl
-install -m755 tools/st2-setup-tests %{buildroot}/usr/local/lib/python2.7/site-packages/st2common/bin/st2-setup-tests
-install -m755 tools/st2-setup-examples %{buildroot}/usr/local/lib/python2.7/site-packages/st2common/bin/st2-setup-examples
-install -m755 tools/st2-self-check %{buildroot}/usr/local/lib/python2.7/site-packages/st2common/bin/st2-self-check
-install -m755 tools/migrate_rules_to_include_pack.py %{buildroot}/usr/local/lib/python2.7/site-packages/st2common/bin/migrate_rules_to_include_pack.py
+install -m755 tools/st2-setup-tests %{buildroot}/usr/lib/python2.7/site-packages/st2common/bin/st2-setup-tests
+install -m755 tools/st2-setup-examples %{buildroot}/usr/lib/python2.7/site-packages/st2common/bin/st2-setup-examples
+install -m755 tools/st2-self-check %{buildroot}/usr/lib/python2.7/site-packages/st2common/bin/st2-self-check
+install -m755 tools/migrate_rules_to_include_pack.py %{buildroot}/usr/lib/python2.7/site-packages/st2common/bin/migrate_rules_to_include_pack.py
 
 %files
-/usr/local/lib/python2.7/site-packages/st2common*
+%{python2_sitelib}/st2common*
 /usr/share/doc/st2/*
 /etc/st2/*
 /opt/stackstorm/*

diff --git a/st2debug/packaging/rpm/st2debug-rhel6.spec b/st2debug/packaging/rpm/st2debug-rhel6.spec
@@ -11,6 +11,8 @@ Vendor: StackStorm
 Packager: Estee Tew <st2@stackstorm.com>
 Requires:       st2common
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -19,12 +21,12 @@ An automation plaform that needs a much better description than this.
 
 %install
 
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages/
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/usr/bin
-cp -R st2debug %{buildroot}/usr/local/lib/python2.7/site-packages/
+cp -R st2debug %{buildroot}%{python2_sitelib}/
 install -m755 bin/st2-submit-debug-info %{buildroot}/usr/bin/st2-submit-debug-info
 
 %files
 
-/usr/local/lib/python2.7/site-packages/st2debug*
+/usr/lib/python2.7/site-packages/st2debug*
 /usr/bin/st2-submit-debug-info
diff --git a/st2reactor/packaging/rpm/st2reactor-rhel6.spec b/st2reactor/packaging/rpm/st2reactor-rhel6.spec
@@ -11,6 +11,8 @@ Vendor: StackStorm
 Packager: Estee Tew <st2@stackstorm.com>
 Requires:     st2common
 
+%include %{_rpmconfigdir}/macros.python
+
 %description
 An automation plaform that needs a much better description than this.
 
@@ -22,18 +24,18 @@ sed -i -r "s~logs~/var/log/st2~g" conf/logging*.conf
 
 %install
 
-mkdir -p %{buildroot}/usr/local/lib/python2.7/site-packages/
+mkdir -p %{buildroot}%{python2_sitelib}
 mkdir -p %{buildroot}/etc/st2reactor
 mkdir -p %{buildroot}/usr/bin/
-cp -R st2reactor %{buildroot}/usr/local/lib/python2.7/site-packages/
+cp -R st2reactor %{buildroot}%{python2_sitelib}/
 cp -R conf/* %{buildroot}/etc/st2reactor
 install -m755 bin/st2sensorcontainer %{buildroot}/usr/bin/st2sensorcontainer
 install -m755 bin/st2rulesengine %{buildroot}/usr/bin/st2rulesengine
 install -m755 bin/st2-rule-tester %{buildroot}/usr/bin/st2-rule-tester
 
 %files
 
-/usr/local/lib/python2.7/site-packages/st2reactor*
+/usr/lib/python2.7/site-packages/st2reactor*
 /usr/bin/st2sensorcontainer
 /usr/bin/st2rulesengine
 /usr/bin/st2-rule-tester