From 1be65ee1fe0083e665f55a58a9901ef07e533355 Mon Sep 17 00:00:00 2001 From: Gleb Goncharov Date: Tue, 19 Apr 2016 14:07:43 +0400 Subject: [PATCH 1/2] rpmbuilder: fixed conflict with filesystem package in CentOS 7.x. --- rpmbuilder.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rpmbuilder.spec b/rpmbuilder.spec index 2b62d78..2eeac52 100644 --- a/rpmbuilder.spec +++ b/rpmbuilder.spec @@ -44,7 +44,8 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc LICENSE.EN LICENSE.RU -%{_bindir} +%{_bindir}/%{name} +%{_bindir}/rpmunbuilder ############################################################################### From 20a6ecb56ef9bd1616eeb526536fcee11382f77d Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 20 Apr 2016 03:22:29 -0400 Subject: [PATCH 2/2] Fixed bug with parsing remote build definition --- SOURCES/rpmbuilder | 6 +++--- rpmbuilder.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SOURCES/rpmbuilder b/SOURCES/rpmbuilder index 60a5a17..667b3df 100755 --- a/SOURCES/rpmbuilder +++ b/SOURCES/rpmbuilder @@ -1,7 +1,7 @@ #!/usr/bin/env bash APP="RPMBuilder" -VER="1.0.6" +VER="1.0.7" #################################################################### @@ -708,7 +708,7 @@ remoteRunMultibuild() { remoteRunBuild() { local spec="$1" - if [[ "$remote" =~ :[0-9]{1,} ]] ; then + if [[ "$remote" =~ :[0-9]{1,}$ ]] ; then local r_file=$(echo "$remote" | cut -f1 -d":") local r_line=$(echo "$remote" | cut -f2 -d":") local tlines=$(cat $r_file | wc -l) @@ -721,7 +721,7 @@ remoteRunBuild() { remote=$(sed -n ${r_line}p $r_file) fi - if [[ "$remote" =~ @|~ ]] ; then + if [[ "$remote" =~ @|~i ]] ; then local host_info=($(getURLVars "$remote")) host="${host_info[0]/-/}" diff --git a/rpmbuilder.spec b/rpmbuilder.spec index 2b62d78..9797ce7 100644 --- a/rpmbuilder.spec +++ b/rpmbuilder.spec @@ -2,7 +2,7 @@ Summary: RPM package build helper Name: rpmbuilder -Version: 1.0.6 +Version: 1.0.7 Release: 0%{?dist} License: EKOL Group: Applications/System @@ -49,6 +49,9 @@ rm -rf %{buildroot} ############################################################################### %changelog +* Wed Apr 20 2016 Anton Novojilov - 1.0.7-0 +- Fixed bug with parsing remote build definition + * Thu Apr 07 2016 Anton Novojilov - 1.0.6-0 - Package install feature - Code refactoring