diff options
-rw-r--r-- | misc/bcfg2.spec | 24 | ||||
-rwxr-xr-x | tools/export.py | 37 |
2 files changed, 0 insertions, 61 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 21307c5ac..15a560593 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -747,9 +747,6 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog -* Thu Nov 07 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.3-1 -- New upstream release - * Sun Aug 04 2013 John Morris <john@zultron.com> - 1.3.2-2 - Reconcile divergences with Fedora specfile, as requested by upstream (equally large changes made in Fedora version to reconcile with @@ -768,33 +765,12 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ - Changes to %%post* scripts - Rearrange %%files sections -* Mon Jul 01 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.2-1 -- New upstream release - -* Thu Mar 21 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.1-1 -- New upstream release - -* Fri Mar 15 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0 -- New upstream release - -* Tue Jan 29 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc2 -- New upstream release - -* Wed Jan 09 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0rc1 -- New upstream release - -* Tue Oct 30 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre2 -- New upstream release - * Wed Oct 17 2012 Chris St. Pierre <chris.a.st.pierre@gmail.com> 1.3.0-0.2pre1 - Split bcfg2-selinux into its own specfile * Fri Sep 14 2012 Chris St. Pierre <chris.a.st.pierre@gmail.com> 1.3.0-0.1pre1 - Added -selinux subpackage -* Fri Aug 31 2012 Sol Jerome <sol.jerome@gmail.com> 1.3.0-0.0pre1 -- New upstream release - * Wed Aug 15 2012 Chris St. Pierre <chris.a.st.pierre@gmail.com> 1.2.3-0.1 - Added tools/ as doc for bcfg2-server subpackage diff --git a/tools/export.py b/tools/export.py index bdb85de41..dc2878e3e 100755 --- a/tools/export.py +++ b/tools/export.py @@ -163,43 +163,6 @@ E.G. 1.2.0pre1 is a valid version. print(help_message) quit() - if version_info['build'] == '': - rpmchangelog = ["* %s %s <%s> %s-1\n" % - (datetime.datetime.now().strftime("%a %b %d %Y"), - name, email, version_release), - "- New upstream release\n", "\n"] - else: - rpmchangelog = ["* %s %s <%s> %s-0.%s.%s\n" % - (datetime.datetime.now().strftime("%a %b %d %Y"), - name, email, version_release, - version_info['build'][-1], version_info['build']), - "- New upstream release\n", "\n"] - - # write out the new RPM changelog - specs = ["misc/bcfg2.spec", - "misc/bcfg2-selinux.spec"] - if options.dryrun: - print("*** Add the following to the top of the %%changelog section in %s:\n%s\n" - % (rpmchangelog, " and ".join(specs))) - else: - for fname in specs: - try: - lines = open(fname).readlines() - for lineno in range(len(lines)): - if lines[lineno].startswith("%changelog"): - break - else: - print("No %changelog section found in %s" % fname) - continue - for line in reversed(rpmchangelog): - lines.insert(lineno + 1, line) - open(fname, 'w').write("".join(lines)) - except: - err = sys.exc_info()[1] - print("Could not write %s: %s" % (fname, err)) - print(help_message) - quit() - # update solaris version find_and_replace('solaris/Makefile', 'VERS=', 'VERS=%s-1\n' % version, |