From 39b38f5cf18c9bd7f755f4f3bbe3c17ca37cd4fa Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 16 Dec 2013 11:53:15 -0600 Subject: misc/bcfg2.spec: Remove upstream release comments We don't need to make changelog edits every time there's a new release. This just clutters up the changelog without adding any useful information. Signed-off-by: Sol Jerome --- tools/export.py | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'tools') 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, -- cgit v1.2.3-1-g7c22 From 8be04df96e1b719d9798ed3fe21a5652bc42650a Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 18 Feb 2014 10:52:20 -0600 Subject: export.py: Fix Source0 for changes in c5ad7f0e Signed-off-by: Sol Jerome --- tools/export.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/export.py b/tools/export.py index dc2878e3e..c185346ca 100755 --- a/tools/export.py +++ b/tools/export.py @@ -270,12 +270,12 @@ E.G. 1.2.0pre1 is a valid version. # http://trac.mcs.anl.gov/projects/bcfg2/ticket/1129 find_and_replace('misc/bcfg2.spec', 'Source0', - 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%s.tar.gz\n' % version_info["build"], + 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%{?_pre_rc}.tar.gz\n', startswith=True, dryrun=options.dryrun) find_and_replace('misc/bcfg2-selinux.spec', 'Source0', - 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%s.tar.gz\n' % version_info["build"], + 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%{?_pre_rc}.tar.gz\n', startswith=True, dryrun=options.dryrun) # update the version in reports -- cgit v1.2.3-1-g7c22 From 07d7fe9c2a120a204b3f61066f33f8a173556d9d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 19 Feb 2014 10:36:47 -0600 Subject: export.py: No longer need escaped % Signed-off-by: Sol Jerome --- tools/export.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/export.py b/tools/export.py index c185346ca..6b0238bbb 100755 --- a/tools/export.py +++ b/tools/export.py @@ -270,12 +270,12 @@ E.G. 1.2.0pre1 is a valid version. # http://trac.mcs.anl.gov/projects/bcfg2/ticket/1129 find_and_replace('misc/bcfg2.spec', 'Source0', - 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%{?_pre_rc}.tar.gz\n', + 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz\n', startswith=True, dryrun=options.dryrun) find_and_replace('misc/bcfg2-selinux.spec', 'Source0', - 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%{?_pre_rc}.tar.gz\n', + 'Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz\n', startswith=True, dryrun=options.dryrun) # update the version in reports -- cgit v1.2.3-1-g7c22