From 0255daf4f2a89071930cfc80147f0649148d4966 Mon Sep 17 00:00:00 2001 From: SARL ENR 68 Date: Thu, 10 Sep 2015 07:54:05 +0200 Subject: Prepare for 3.0 release - merged bm-2.1-move-log.patch - fix shebang - fix license - fix bm URL --- BuildManager/build.py | 2 +- BuildManager/optionparser.py | 1 - PKG-INFO | 10 +++++----- bm | 4 ++-- bmclean | 4 ++-- setup.py | 8 ++++---- 6 files changed, 14 insertions(+), 15 deletions(-) mode change 100755 => 100644 bm mode change 100755 => 100644 bmclean mode change 100755 => 100644 setup.py diff --git a/BuildManager/build.py b/BuildManager/build.py index 600d883..fa578cf 100644 --- a/BuildManager/build.py +++ b/BuildManager/build.py @@ -117,7 +117,7 @@ class PackageBuilder: if self.opts.move_log: move_file(pkg.log, self.opts.move_log, - dryrun=self.dryrun) + dryrun=self.opts.dryrun) if self.opts.clean or self.opts.clean_on_success: if pkg.builddir != "/": logger.info("cleaning build directory") diff --git a/BuildManager/optionparser.py b/BuildManager/optionparser.py index 795848a..0adf8a8 100644 --- a/BuildManager/optionparser.py +++ b/BuildManager/optionparser.py @@ -1,4 +1,3 @@ -#!/usr/bin/python from BuildManager import Error import optparse diff --git a/PKG-INFO b/PKG-INFO index 6abe5db..e58099e 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,11 +1,11 @@ Metadata-Version: 1.0 Name: bm -Version: 2.1 +Version: 3.0 Summary: BuildManager - rpm package building helper -Home-page: http://moin.conectiva.com.br/BuildManager -Author: Gustavo Niemeyer -Author-email: niemeyer@conectiva.com -License: GPL +Home-page: http://gitweb.mageia.org/software/build-system/bm/ +Author: Gustavo Niemeyer, Papoteur +Author-email: niemeyer@conectiva.com, papoteur@mageialinux-online.org +License: GPLv2 Description: BuildManager, or bm, is a program that wraps and extends rpm while building packages. Its features allow one to batch process thousand of RPMS at once, controling logs, rpm and srpm moving, filtering the list of files, ignoring diff --git a/bm b/bm old mode 100755 new mode 100644 index 6124d60..40c44c0 --- a/bm +++ b/bm @@ -7,8 +7,8 @@ import logging import sys, os import pwd -AUTHOR = "Gustavo Niemeyer " -VERSION = "2.2" +AUTHOR = "Gustavo Niemeyer , papoteur " +VERSION = "3.0" def passtrough(option, opt, val, parser): opts = parser.values diff --git a/bmclean b/bmclean old mode 100755 new mode 100644 index a8fb6e6..3658f15 --- a/bmclean +++ b/bmclean @@ -7,8 +7,8 @@ import logging import sys, os import pwd -AUTHOR = "Gustavo Niemeyer " -VERSION = "2.2" +AUTHOR = "Gustavo Niemeyer , papoteur " +VERSION = "3.0" def parse_options(): parser = OptionParser("%prog [OPTIONS] ", diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 9882c14..161e8a4 --- a/setup.py +++ b/setup.py @@ -12,10 +12,10 @@ VERSION = m.group(1) setup(name="bm", version = VERSION, description = "BuildManager - rpm package building helper", - author = "Gustavo Niemeyer", - author_email = "niemeyer@conectiva.com", - url = "http://moin.conectiva.com.br/BuildManager", - license = "GPL", + author = "Gustavo Niemeyer, Papoteur", + author_email = "niemeyer@conectiva.com, papoteur@mageialinux-online.org", + url = "http://gitweb.mageia.org/software/build-system/bm/", + license = "GPLv2", long_description = """\ BuildManager, or bm, is a program that wraps and extends rpm while building -- cgit v1.2.1