[autotest-framework/el6] Updated to 0.16.0-2

Mon Apr 7 14:33:17 UTC 2014

commit a82ba5cf49e1bbcb4bcc99934aea7c63ed9d9622
Author: Cleber Rosa <crosa at redhat.com>
Date:   Mon Apr 7 10:40:07 2014 -0300

    Updated to 0.16.0-2

 .gitignore                                         |    3 +
 0001-Add-README-for-deployment-on-Fedora.patch     |   22 ---
 ...ild_externals-script-from-being-called-at.patch |   29 ----
 0003-Change-paths-according-to-new-packaging.patch |  148 --------------------
 ...-install-unnecessary-packaging-wise-files.patch |   56 --------
 autotest-framework.spec                            |   99 +++++++++-----
 autotest-notests-0.14.4.tar.bz2                    |  Bin 10226779 -> 0 bytes
 sources                                            |    4 +-
 8 files changed, 72 insertions(+), 289 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2a1fa60..adab912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 /autotest-notests-0.14.3.tar.bz2
 /autotest-notests-0.14.4.tar.bz2
+/0001-__init__.py-Fix-virt-test-issue-275.patch
+/0002-setup.py-include-a-setup-module-for-shared-module.patch
+/autotest-0.16.0-539bd79.tar.gz
diff --git a/autotest-framework.spec b/autotest-framework.spec
index 2c58893..cd5f019 100644
--- a/autotest-framework.spec
+++ b/autotest-framework.spec
@@ -2,11 +2,21 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+%define shortname autotest
+%global commit 539bd797305b310d255e539001178671b9b79b23
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 %bcond_with gwt
 
 Name: autotest-framework
-Version: 0.14.4
-Release: 1%{?dist}
+Version: 0.16.0
+Release: 2%{?dist}
 Summary: Framework for fully automated testing
 Group: Applications/System
 # All content is GPLv2 unless otherwise stated.
@@ -17,17 +27,14 @@ Group: Applications/System
 License: GPLv2 and BSD and LGPLv2+ and MIT
 URL: http://autotest.github.com/
 BuildArch: noarch
-Source0: https://github.com/downloads/autotest/autotest/autotest-notests-%{version}.tar.bz2
+Source0: https://github.com/autotest/%{shortname}/archive/%{commit}/%{shortname}-%{version}-%{shortcommit}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-# Not sent upstream, specific to Fedora and/or FHS guidelines
-Patch1: 0001-Add-README-for-deployment-on-Fedora.patch
-Patch2: 0002-Stop-the-build_externals-script-from-being-called-at.patch
-Patch3: 0003-Change-paths-according-to-new-packaging.patch
-Patch4: 0004-Do-not-install-unnecessary-packaging-wise-files.patch
+Patch1: 0001-__init__.py-Fix-virt-test-issue-275.patch
+Patch2: 0002-setup.py-include-a-setup-module-for-shared-module.patch
 
 Requires: grubby
-Requires: python >= 2.4
+Requires: python
 Requires: openssh-clients
 Requires: openssh-server
 Requires: rsync
@@ -36,7 +43,7 @@ Requires: tar, gzip, bzip2, unzip
 Requires(post): openssh
 Requires(pre): shadow-utils
 
-BuildRequires: python >= 2.4
+BuildRequires: python2-devel, python-sphinx
 
 %description
 Autotest is a framework for fully automated testing. It is designed primarily
@@ -54,6 +61,7 @@ Summary: Server test harness and front-end for autotest
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 Requires: Django >= 1.3
+Requires: Django-south
 Requires: conmux
 Requires: mysql-server
 Requires: gnuplot
@@ -69,6 +77,8 @@ Requires: python-paramiko
 Requires: python-simplejson
 Requires: python-setuptools
 Requires: python-httplib2
+Requires: python-psutil
+
 
 %if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
 Requires(post): policycoreutils-python
@@ -116,23 +126,34 @@ Web frontend for server using GWT
 
 
 %prep
-%setup -q -n autotest-notests-%{version}
+%setup -q -n %{shortname}-%{commit}
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
-sed -i -e "s|DocumentRoot /usr/local/autotest/apache/www|DocumentRoot %{_datadir}/autotest/www|" apache/apache-conf
-sed -i -e "s|/usr/local/autotest|%{python_sitelib}/autotest|" global_config.ini
+sed -i -e "s|DocumentRoot /usr/local/autotest/apache/www|DocumentRoot %{_datadir}/autotest/www|" apache/apache-web-conf
+./installation_support/global_config_set_value.py -p global_config.ini -s COMMON -k autotest_top_path -v %{python_sitelib}/autotest
+./installation_support/global_config_set_value.py -p global_config.ini -s COMMON -k test_dir -v %{_sharedstatedir}/autotest/tests/
+./installation_support/global_config_set_value.py -p global_config.ini -s COMMON -k test_output_dir -v %{_sharedstatedir}/autotest/
+./installation_support/global_config_set_value.py -p global_config.ini -s AUTOSERV -k client_autodir_paths -v %{python_sitelib}/autotest
+./installation_support/global_config_set_value.py -p global_config.ini -s CLIENT -k output_dir -v %{_sharedstatedir}/autotest/
+./installation_support/global_config_set_value.py -p global_config.ini -s SERVER -k rpc_log_path -v %{_localstatedir}/log/autotest/rpcserver.log
+./installation_support/global_config_set_value.py -p global_config.ini -s SERVER -k logs_dir -v %{_localstatedir}/log/autotest
+./installation_support/global_config_set_value.py -p global_config.ini -s SERVER -k pid_files_dir -v %{_localstatedir}/run/autotest
+
+sed -i -e "s|^PID_PATH.*|PID_PATH=%{_localstatedir}/run/autotest|" utils/autotest-rh.init
+sed -i -e "s|/usr/local/$PROG|%{python_site_lib}/$PROG|" utils/autotest-rh.init
+
+sed -i -e "s|/usr/local/autotest/scheduler/autotest-scheduler-watcher|%{_bindir}/autotest-scheduler-watcher|" utils/autotestd.service
+
 echo "%{version}" > RELEASE-VERSION
 
 
 %build
-python setup.py build
+%{__python2} setup.py build
 # GWT is not packaged in Fedora, build web frontend that uses it only when --with gwt
 %if %{with gwt}
-python utils/compile_gwt_clients.py -c 'autotest.EmbeddedSpreadsheetClient autotest.AfeClient autotest.TkoClient autotest.EmbeddedTkoClient'
+%{__python2} utils/compile_gwt_clients.py -c 'autotest.EmbeddedSpreadsheetClient autotest.AfeClient autotest.TkoClient autotest.EmbeddedTkoClient'
 %endif
 
 
@@ -162,7 +183,7 @@ cp -a client/shared/README README.common_lib
 cp -a apache/conf/cgi-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
 cp -a apache/conf/django-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
 cp -a apache/conf/tko-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
-cp -a apache/apache-conf %{buildroot}%{_sysconfdir}/httpd/conf.d/autotest.conf
+cp -a apache/apache-conf %{buildroot}%{_sysconfdir}/httpd/conf.d/zzz_autotest.conf
 
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 # Install systemd init script
@@ -184,7 +205,7 @@ cp -a apache/conf/embedded-spreadsheet-directives %{buildroot}%{_sysconfdir}/htt
 cp -a apache/conf/embedded-tko-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
 cp -a apache/conf/gwt-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
 cp -a apache/conf/new-tko-directives %{buildroot}%{_sysconfdir}/httpd/autotest.d
-cp -a apache/apache-web-conf %{buildroot}%{_sysconfdir}/httpd/conf.d/autotest-web.conf
+cp -a apache/apache-web-conf %{buildroot}%{_sysconfdir}/httpd/conf.d/zzz_autotest-web.conf
 
 rm -f %{buildroot}%{python_sitelib}/autotest/frontend/client/.classpath
 rm -f %{buildroot}%{python_sitelib}/autotest/frontend/client/.project
@@ -226,11 +247,7 @@ for lib in $(find %{buildroot}%{python_sitelib}/autotest/ -name '*.py'); do
     touch -r $lib $lib.new &&
     mv $lib.new $lib
 done
-chmod +x %{buildroot}%{python_sitelib}/autotest/tko/*.cgi
 rm -rf %{buildroot}%{python_sitelib}/autotest-*.egg-info
-mv %{buildroot}%{python_sitelib}/autotest/frontend/migrations/070_add_acl_group_replace_django_fixture.py \
-   %{buildroot}%{python_sitelib}/autotest/frontend/migrations/069_add_acl_group_replace_django_fixture.py
-
 
 %clean
 rm -rf %{buildroot}
@@ -253,10 +270,9 @@ fi
 %post server
 if [ $1 -eq 1 ] ; then
     # Initial installation
-    semanage fcontext -a -t bin_t '%{python_sitelib}/autotest/tko(/.*cgi)?'
     restorecon %{python_sitelib}/autotest/tko/*
     %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
     %else
     /sbin/chkconfig --add autotestd >/dev/null 2>&1 || :
     %endif
@@ -267,8 +283,8 @@ fi
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    /bin/systemctl --no-reload disable autotestd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop autotestd.service > /dev/null 2>&1 || :
+    /usr/bin/systemctl --no-reload disable autotestd.service > /dev/null 2>&1 || :
+    /usr/bin/systemctl stop autotestd.service > /dev/null 2>&1 || :
     %else
     /sbin/service autotestd stop >/dev/null 2>&1
     /sbin/chkconfig --del autotestd >/dev/null 2>&1 || :
@@ -277,11 +293,11 @@ fi
 
 
 %postun server
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-    /bin/systemctl try-restart autotestd.service >/dev/null 2>&1 || :
+    /usr/bin/systemctl try-restart autotestd.service >/dev/null 2>&1 || :
     %else
     /sbin/service autotestd condrestart >/dev/null 2>&1 || :
     %endif
@@ -318,18 +334,20 @@ fi
 %config(noreplace) %{_sysconfdir}/httpd/autotest.d/cgi-directives
 %config(noreplace) %{_sysconfdir}/httpd/autotest.d/django-directives
 %config(noreplace) %{_sysconfdir}/httpd/autotest.d/tko-directives
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/autotest.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/zzz_autotest.conf
 %{python_sitelib}/autotest/cli/
-%{python_sitelib}/autotest/database/
+%{python_sitelib}/autotest/database_legacy/
 %{python_sitelib}/autotest/frontend/
 %if %{with gwt}
 %exclude %{python_sitelib}/autotest/frontend/client/
 %endif
+%{python_sitelib}/autotest/shared/
 %{python_sitelib}/autotest/mirror/
 %{python_sitelib}/autotest/scheduler/
 %{python_sitelib}/autotest/server/
 %{python_sitelib}/autotest/utils/
 %{python_sitelib}/autotest/tko/
+%{python_sitelib}/autotest/installation_support/
 %{_datadir}/autotest/mirror/
 %{_datadir}/autotest/utils/
 %{_datadir}/autotest/tko/
@@ -341,7 +359,6 @@ fi
 %{_bindir}/autotest-manage-rpc-server
 %{_bindir}/autotest-rpc-change-protection-level
 %{_bindir}/autotest-rpc-client
-%{_bindir}/autotest-rpc-compose-query
 %{_bindir}/autotest-rpc-migrate-host
 %{_bindir}/autotest-rpc-query-keyvals
 %{_bindir}/autotest-rpc-query-results
@@ -349,6 +366,9 @@ fi
 %{_bindir}/autotest-scheduler
 %{_bindir}/autotest-scheduler-watcher
 %{_bindir}/autotest-upgrade-db
+%{_bindir}/autotest-database-turnkey
+%{_bindir}/autotest-firewalld-add-service
+%{_bindir}/autotest-install-packages-deps
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %{_unitdir}/autotestd.service
 %else
@@ -370,6 +390,19 @@ fi
 
 
 %changelog
+* Mon Apr  7 2014 Cleber Rosa <cleber at redhat.com> - 0.16.0-2
+- Added python macros for proper building on EL6
+- Added fix for shared module installation
+- Renamed httpd configuration so that it is parsed last
+
+* Wed Jan 29 2014 Cleber Rosa <cleber at redhat.com> - 0.16.0-1
+- Package 0.16.0 release
+- Fixed bogus date on ancient (0.11.0-2) release
+- Added patch in upstream 0.16.0 branch but still not on released tarball
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Mon Nov 19 2012 Cleber Rosa <cleber at redhat.com> - 0.14.4-1
 - Package 0.14.4 release
 - Dropped patches applied upstream
@@ -473,7 +506,7 @@ fi
 * Fri Nov 13 2009 James Laska <jlaska at redhat.com> - 0.11.0-3
 - Moved autotest user creation into autotest-client package
 
-* Tue Oct 30 2009 James Laska <jlaska at redhat.com> - 0.11.0-2
+* Fri Oct 30 2009 James Laska <jlaska at redhat.com> - 0.11.0-2
 - Updated patch2 - new_tko/tko/graphing.py uses simplejson also
 - Updated patch3 - correct http log paths
 - Updated patch5 - background patch to work against monitor_db_babysitter
diff --git a/sources b/sources
index 9480cf2..bc20491 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-47d2ddcf1cadbd7f59ad3b22cf3c63e6  autotest-notests-0.14.4.tar.bz2
+20ac919fe9095ecd273aec3c48879a8a  0001-__init__.py-Fix-virt-test-issue-275.patch
+fd113eb0b9d0bcc87d5881dff8cb40aa  0002-setup.py-include-a-setup-module-for-shared-module.patch
+b1198f80c3316b069f8ccb77146849b5  autotest-0.16.0-539bd79.tar.gz
