diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | packaging/rpm/ansible.spec | 28 |
2 files changed, 26 insertions, 12 deletions
@@ -93,6 +93,10 @@ RPMRELEASE = $(RELEASE) ifneq ($(OFFICIAL),yes) RPMRELEASE = 100.git$(DATE)$(GITINFO) endif +ifeq ($(PUBLISH),nightly) + # https://fedoraproject.org/wiki/Packaging:Versioning#Snapshots + RPMRELEASE = $(RELEASE).$(DATE)git.$(GIT_HASH) +endif RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)" # MOCK build parameters @@ -201,17 +205,17 @@ sdist_upload: clean docs rpmcommon: sdist @mkdir -p rpm-build @cp dist/*.gz rpm-build/ - @sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPMRELEASE)%{?dist}#' $(RPMSPEC) >rpm-build/$(NAME).spec + @sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPMRELEASE)%{?dist}$(REPOTAG)#' $(RPMSPEC) >rpm-build/$(NAME).spec mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon - $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/ --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/ + $(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build/ @echo "#############################################" @echo "Ansible SRPM is built:" @echo rpm-build/*.src.rpm @echo "#############################################" mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm - $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/ --rebuild rpm-build/$(NAME)-*.src.rpm + $(MOCK_BIN) -r $(MOCK_CFG) $(MOCK_ARGS) --resultdir rpm-build/ --rebuild rpm-build/$(NAME)-*.src.rpm @echo "#############################################" @echo "Ansible RPM is built:" @echo rpm-build/*.noarch.rpm diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 8fcb79e73e..76dd3ff55e 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -10,11 +10,11 @@ Version: %{ansible_version} Release: 1%{?dist} Url: https://www.ansible.com Summary: SSH-based application deployment, configuration management, and IT orchestration platform -License: GPLv3 +License: GPLv3+ Group: Development/Libraries Source: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} BuildArch: noarch @@ -33,7 +33,12 @@ Requires: python26-six # RHEL == 6 %if 0%{?rhel} == 6 -Requires: python-crypto2.6 +Requires: python-crypto +%endif + +# RHEL >=7 +%if 0%{?rhel} >= 7 +Requires: python2-cryptography %endif # RHEL > 5 @@ -43,8 +48,6 @@ BuildRequires: python-setuptools Requires: PyYAML Requires: python-paramiko Requires: python-jinja2 -Requires: python-keyczar -Requires: python-httplib2 Requires: python-setuptools Requires: python-six %endif @@ -63,7 +66,7 @@ Requires: python-six %endif # SuSE/openSuSE -%if 0%{?suse_version} +%if 0%{?suse_version} BuildRequires: python-devel BuildRequires: python-setuptools Requires: python-paramiko @@ -89,10 +92,16 @@ are transferred to managed machines automatically. %setup -q %build -%{__python} setup.py build +%{__python2} setup.py build %install -%{__python} setup.py install -O1 --prefix=%{_prefix} --root=%{buildroot} +%{__python2} setup.py install --root=%{buildroot} + +for i in %{buildroot}/%{_bindir}/{ansible,ansible-console,ansible-doc,ansible-galaxy,ansible-playbook,ansible-pull,ansible-vault}; do + mv $i $i-%{python2_version} + ln -s %{_bindir}/$(basename $i)-%{python2_version} $i + ln -s %{_bindir}/$(basename $i)-%{python2_version} $i-2 +done # Amazon Linux doesn't install to dist-packages but python_sitelib expands to # that location and the python interpreter expects things to be there. @@ -105,6 +114,7 @@ if expr x'%{python_sitelib}' : 'x.*dist-packages/\?' ; then fi mkdir -p %{buildroot}/etc/ansible/ +mkdir -p %{buildroot}/etc/ansible/roles/ cp examples/hosts %{buildroot}/etc/ansible/ cp examples/ansible.cfg %{buildroot}/etc/ansible/ mkdir -p %{buildroot}/%{_mandir}/man1/ @@ -120,7 +130,7 @@ rm -rf %{buildroot} %{_bindir}/ansible* %dir %{_datadir}/ansible %config(noreplace) %{_sysconfdir}/ansible -%doc README.md PKG-INFO COPYING +%doc README.md PKG-INFO COPYING CHANGELOG.md %doc %{_mandir}/man1/ansible* %changelog |