Merge pull request #83 from essentialkaos/develop

Version 2.7.2

SOURCES/libexec/build.shx

@@ -458,10 +458,9 @@ getYumOpts() {
 # Convert utility options to rpmbuild options
 #
 # Code: No
-# Echo: No
+# Echo: Options (String)
 getBuildOpts() {
   local opts=""
-  local macros_def
 
   if [[ -n "$no_source" ]] ; then
     opts="-bb"
@@ -479,13 +478,27 @@ getBuildOpts() {
   [[ -n "$without" ]] && opts="$opts $(getBuildOptsWithout)"
   [[ -n "$verbose" ]] && opts="$opts --verbose"
 
+  if [[ -n "$define" ]] ; then
+    opts="$opts $(getDefineOpts)"
+  fi
+
+  echo "$opts"
+}
+
+# Get options with macro definitions
+#
+# Code: No
+# Echo: Options (String)
+getDefineOpts() {
+  local opts macros_def
+
   if [[ -n "$define" ]] ; then
     for macros_def in $define ; do
-      opts="$opts --define=\"${macros_def/=/ }\""
+      opts="--define=\"${macros_def/=/ }\" ${opts}"
     done
   fi
 
-  echo "$opts"
+  echo "${opts% }"
 }
 
 # Get build prefix

SOURCES/libexec/spec.shx

@@ -53,7 +53,13 @@ readInspecOptions() {
 # Code: No
 # Echo: Sources list (String)
 getSources() {
-  spectool -n -S "$1" 2>/dev/null | cut -f2 -d" "
+  local opts
+
+  if [[ -n "$define" ]] ; then
+    opts=$(getDefineOpts)
+  fi
+
+  eval "spectool -n -S $opts $1" 2>/dev/null | cut -f2 -d" "
 }
 
 # Get patches
@@ -63,7 +69,13 @@ getSources() {
 # Code: No
 # Echo: Patches list (String)
 getPatches() {
-  spectool -n -P "$1" 2>/dev/null | cut -f2 -d" "
+  local opts
+
+  if [[ -n "$define" ]] ; then
+    opts=$(getDefineOpts)
+  fi
+
+  eval "spectool $opts -n -P $1" 2>/dev/null | cut -f2 -d" "
 }
 
 # Bump version in spec after successful build

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="2.7.1"
+VER="2.7.2"
 
 ################################################################################
 

rpmbuilder.spec

@@ -2,7 +2,7 @@
 
 Summary:         RPM package build helper
 Name:            rpmbuilder
-Version:         2.7.1
+Version:         2.7.2
 Release:         0%{?dist}
 License:         EKOL
 Group:           Development/Tools
@@ -55,6 +55,10 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Mar 10 2020 Anton Novojilov <andy@essentialkaos.com> - 2.7.2-0
+- Fixed bug with handling macroses defined through --define option while
+  downloading sources and patches
+
 * Wed Feb 05 2020 Anton Novojilov <andy@essentialkaos.com> - 2.7.1-0
 - Fixed handling --download option with predefined options in preferences file