Changeset 193 for trunk

Timestamp:

07/13/15 21:19:41 (9 years ago)

Author:

kdeugau

Message:

/trunk

A rollup of trivial bits.

• Prod copyright dates
• Remove [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT leadin on %install scriptlet; rpmbuild either never did this (possible) or it doesn't do it any more (more likely)
• Fix subtle brokenness in boolean macro %{?foo}/%{?!foo}; it was producing output when it shouldn't have.

File:

• trunk/debbuild (modified) (4 diffs)

trunk/debbuild

@@ -10 +10 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2005-2013 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright (C) 2005-2015 Kris Deugau <kdeugau@deepnet.cx>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -289 +289 @@
 # %install doesn't need the full treatment from %clean;  just an empty place to install to.
 # NB - rpm doesn't do this;  is it really necessary?
-my $installscript = '[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT'."\n";
+my $installscript = '';
+#'[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT'."\n";
 my $cleanscript = '';
 
@@ -483 +484 @@
         } elsif (/^--help/) {
           print "debbuild v$version".q{
-Copyright 2005-2012 Kris Deugau <kdeugau@deepnet.cx>
+Copyright 2005-2015 Kris Deugau <kdeugau@deepnet.cx>
 
 Build .deb packages from RPM-style .spec files
@@ -2005 +2006 @@
       my $qex = $1;
       my $macro = $2;
-      my $value = (defined($3) ? $3 : '');
-
+      my $value = '';
+      if (defined($3)) {
+        $value = $3;
+      } else {
+        $value = $specglobals{$macro} if $specglobals{$macro};
+      }
       my $neg = '1' if $qex =~ /\!/;
       if ($specglobals{$macro}) {