Changeset 209

Timestamp:

10/04/15 22:20:42 (9 years ago)

Author:

kdeugau

Message:

/trunk

File off another few minor nuisances

• don't expand macros in $tarballdir during %setup or %patch processing
• hard fail on unknown %patch flag/option Just Like rpmbuild
• reenable %{buildsubdir}, since according to the comment in /usr/lib/rpm/macros it *should* be defined/set when using %setup, even if it doesn't seem to be in testing. Also, one of my packages uses it, and I'm not sure where else you're supposed to get the information it provides unless you manually set it up.

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -951 +951 @@
 
         $prepscript .= "cd '$topdir/BUILD'\n";
-        $tarballdir = expandmacros($tarballdir,'gp');
         $prepscript .= "rm -rf '$tarballdir'\n" if $deldir;
         $prepscript .= "/bin/mkdir -p $tarballdir\n" if $changedir;
@@ -1034 +1033 @@
           } elsif ($popt =~ (/^-E/) ) {
             $noempty = 1;
+          } elsif ($popt =~ (/^(-[^s]+)/) ) {
+            die "Unknown \%patch option $1: $line\n";
           }
         } # while (shift @pbits)
@@ -2025 +2026 @@
 
     $macrostring =~ s|%{_builddir}|%{_topdir}/BUILD|g;
-# no longer a valid macro/tag
-#    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
+# Not predefined in an eternal file;  defaults to %{name}-%{version}
+    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
     $macrostring =~ s|%{_topdir}|$topdir|g;
     $macrostring =~ s|%{_tmppath}|$tmpdir|g;