Changeset 193 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r191 r193  
    1010# Last update by $Author$
    1111###
    12 # Copyright (C) 2005-2013 Kris Deugau <kdeugau@deepnet.cx>
     12# Copyright (C) 2005-2015 Kris Deugau <kdeugau@deepnet.cx>
    1313#
    1414#    This program is free software; you can redistribute it and/or modify
     
    289289# %install doesn't need the full treatment from %clean;  just an empty place to install to.
    290290# NB - rpm doesn't do this;  is it really necessary?
    291 my $installscript = '[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT'."\n";
     291my $installscript = '';
     292#'[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT'."\n";
    292293my $cleanscript = '';
    293294
     
    483484        } elsif (/^--help/) {
    484485          print "debbuild v$version".q{
    485 Copyright 2005-2012 Kris Deugau <kdeugau@deepnet.cx>
     486Copyright 2005-2015 Kris Deugau <kdeugau@deepnet.cx>
    486487
    487488Build .deb packages from RPM-style .spec files
     
    20052006      my $qex = $1;
    20062007      my $macro = $2;
    2007       my $value = (defined($3) ? $3 : '');
    2008 
     2008      my $value = '';
     2009      if (defined($3)) {
     2010        $value = $3;
     2011      } else {
     2012        $value = $specglobals{$macro} if $specglobals{$macro};
     2013      }
    20092014      my $neg = '1' if $qex =~ /\!/;
    20102015      if ($specglobals{$macro}) {
Note: See TracChangeset for help on using the changeset viewer.