From e4edb2842a8816a3eed596aea1c28aa769a31e9d Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Mon, 21 May 2018 16:14:53 -0700 Subject: 2.6 changelog gen/version/root dir cleanup (#40421) * patched in changelog gen stuff from stable-2.5 * Makefile updates * release.py as single-source-of-truth * Remove obsolete ansible-core-sitemap.xml file. * Move ROADMAP.rst into README.rst. * dynamic rpm changelog, zap old deb/rpm changelogs * fix changelog in MANIFEST.in * Remove obsolete hacking/update.sh script. * Remove ref to deleted authors script. * Remove ref to removed module-formatter script. * Update headings to match script names. * MANIFEST.in cleanup * removed RELEASES.txt and versions.yml * removed obsolete release generation playbook/bits (not used since 2.5) * misc Makefile cleanup * speculative changes to DEB versioning * allow override of DEB_VERSION/DEB_RELEASE --- packaging/rpm/ansible.spec | 181 ++------------------------------------------- 1 file changed, 8 insertions(+), 173 deletions(-) (limited to 'packaging/rpm') diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index f74e07c62b..c7b72ce708 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -1,18 +1,18 @@ %define name ansible -%define ansible_version $VERSION +%define release_date %(date "+%a %b %e %Y") %if 0%{?rhel} == 5 %define __python2 /usr/bin/python26 %endif Name: %{name} -Version: %{ansible_version} -Release: 1%{?dist} +Version: %{rpmversion} +Release: %{rpmrelease}%{?dist}%{?repotag} Url: https://www.ansible.com Summary: SSH-based application deployment, configuration management, and IT orchestration platform License: GPLv3+ Group: Development/Libraries -Source: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz +Source: https://releases.ansible.com/ansible/%{name}-%{upstream_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %{!?__python2: %global __python2 /usr/bin/python2.6} %{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -87,7 +87,7 @@ on remote nodes. Extension modules can be written in any language and are transferred to managed machines automatically. %prep -%setup -q +%setup -q -n %{name}-%{upstream_version} %build %{__python2} setup.py build @@ -128,175 +128,10 @@ rm -rf %{buildroot} %{_bindir}/ansible* %dir %{_datadir}/ansible %config(noreplace) %{_sysconfdir}/ansible -%doc README.rst PKG-INFO COPYING CHANGELOG.md +%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-*.rst %doc %{_mandir}/man1/ansible* %changelog -* Wed Feb 24 2016 Ansible, Inc. - 2.0.1.0-1 -- Release 2.0.1.0-1 - -* Thu Jan 14 2016 Ansible, Inc. - 2.0.0.2-1 -- Release 2.0.0.2-1 - -* Tue Jan 12 2016 Ansible, Inc. - 2.0.0.1-1 -- Release 2.0.0.1-1 - -* Tue Jan 12 2016 Ansible, Inc. - 2.0.0.0-1 -- Release 2.0.0.0-1 - -* Fri Oct 09 2015 Ansible, Inc. - 1.9.4 -- Release 1.9.4 - -* Thu Sep 03 2015 Ansible, Inc. - 1.9.3 -- Release 1.9.3 - -* Wed Jun 24 2015 Ansible, Inc. - 1.9.2 -- Release 1.9.2 - -* Mon Apr 27 2015 Ansible, Inc. - 1.9.1 -- Release 1.9.1 - -* Wed Mar 25 2015 Ansible, Inc. - 1.9.0 -- Release 1.9.0 - -* Thu Feb 19 2015 Ansible, Inc. - 1.8.4 -- Release 1.8.4 - -* Tue Feb 17 2015 Ansible, Inc. - 1.8.3 -- Release 1.8.3 - -* Thu Dec 04 2014 Michael DeHaan - 1.8.2 -- Release 1.8.2 - -* Wed Nov 26 2014 Michael DeHaan - 1.8.1 -- Release 1.8.1 - -* Tue Nov 25 2014 Michael DeHaan - 1.8.0 -- Release 1.8.0 - -* Wed Sep 24 2014 Michael DeHaan - 1.7.2 -- Release 1.7.2 - -* Thu Aug 14 2014 Michael DeHaan - 1.7.1 -- Release 1.7.1 - -* Wed Aug 06 2014 Michael DeHaan - 1.7.0 -- Release 1.7.0 - -* Fri Jul 25 2014 Michael DeHaan - 1.6.10 -- Release 1.6.10 - -* Thu Jul 24 2014 Michael DeHaan - 1.6.9 -- Release 1.6.9 - -* Tue Jul 22 2014 Michael DeHaan - 1.6.8 -- Release 1.6.8 - -* Mon Jul 21 2014 Michael DeHaan - 1.6.7 -- Release 1.6.7 - -* Tue Jul 01 2014 Michael DeHaan - 1.6.6 -- Release 1.6.6 - -* Wed Jun 25 2014 Michael DeHaan - 1.6.5 -- Release 1.6.5 - -* Wed Jun 25 2014 Michael DeHaan - 1.6.4 -- Release 1.6.4 - -* Mon Jun 09 2014 Michael DeHaan - 1.6.3 -- Release 1.6.3 - -* Fri May 23 2014 Michael DeHaan - 1.6.2 -- Release 1.6.2 - -* Wed May 07 2014 Michael DeHaan - 1.6.1 -- Release 1.6.1 - -* Mon May 05 2014 Michael DeHaan - 1.6.0 -- Release 1.6.0 - -* Fri Apr 18 2014 Michael DeHaan - 1.5.5 -- Release 1.5.5 - -* Tue Apr 01 2014 Michael DeHaan - 1.5.4 -- Release 1.5.4 - -* Thu Mar 13 2014 Michael DeHaan - 1.5.3 -- Release 1.5.3 - -* Tue Mar 11 2014 Michael DeHaan - 1.5.2 -- Release 1.5.2 - -* Mon Mar 10 2014 Michael DeHaan - 1.5.1 -- Release 1.5.1 - -* Fri Feb 28 2014 Michael DeHaan - 1.5.0 -- Release 1.5.0 - -* Fri Feb 28 2014 Michael DeHaan - 1.5-0 -* Release 1.5 - -* Wed Feb 12 2014 Michael DeHaan - 1.4.5 -* Release 1.4.5 - -* Mon Jan 06 2014 Michael DeHaan - 1.4.4 -* Release 1.4.4 - -* Fri Dec 20 2013 Michael DeHaan - 1.4.3 -* Release 1.4.3 - -* Wed Dec 18 2013 Michael DeHaan - 1.4.2 -* Release 1.4.2 - -* Wed Nov 27 2013 Michael DeHaan - 1.4-1 -* Release 1.4.1 - -* Thu Nov 21 2013 Michael DeHaan - 1.4-0 -* Release 1.4.0 - -* Fri Sep 13 2013 Michael DeHaan - 1.3-0 -* Release 1.3.0 - -* Fri Jul 05 2013 Michael DeHaan - 1.2-2 -* Release 1.2.2 - -* Thu Jul 04 2013 Michael DeHaan - 1.2-1 -* Release 1.2.1 - -* Mon Jun 10 2013 Michael DeHaan - 1.2-0 -* Release 1.2 - -* Tue Apr 2 2013 Michael DeHaan - 1.1-0 -* Release 1.1 - -* Fri Feb 1 2013 Michael DeHaan - 1.0-0 -- Release 1.0 - -* Fri Nov 30 2012 Michael DeHaan - 0.9-0 -- Release 0.9 - -* Fri Oct 19 2012 Michael DeHaan - 0.8-0 -- Release of 0.8 - -* Mon Aug 6 2012 Michael DeHaan - 0.7-0 -- Release of 0.7 - -* Mon Aug 6 2012 Michael DeHaan - 0.6-0 -- Release of 0.6 - -* Wed Jul 4 2012 Michael DeHaan - 0.5-0 -- Release of 0.5 - -* Wed May 23 2012 Michael DeHaan - 0.4-0 -- Release of 0.4 - -* Mon Apr 23 2012 Michael DeHaan - 0.3-1 -- Release of 0.3 - -* Tue Apr 3 2012 John Eckersberg - 0.0.2-1 -- Release of 0.0.2 - -* Sat Mar 10 2012 - 0.0.1-1 -- Release of 0.0.1 +* %{release_date} Ansible, Inc. - %{rpmversion}-%{rpmrelease} +- Release %{rpmversion}-%{rpmrelease} -- cgit v1.2.1