Changes between Initial Version and Version 1 of Ticket #1384, comment 2


Ignore:
Timestamp:
Mar 24, 2016, 11:18:22 AM (8 years ago)
Author:
ryandesign (Ryan Carsten Schmidt)
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #1384, comment 2

    initial v1  
    22infrastructure to get this fix.
    33
     4{{{
    45Index: portrpmpackage.tcl
    5 ============================================================
    6 =======
     6===================================================================
    77RCS file: /Volumes/src/cvs/od/proj/darwinports/base/src/port1.0/portrpmpackage.tcl,v
    88retrieving revision 1.6
    … …  
    1111+++ portrpmpackage.tcl  7 Jan 2004 18:05:59 -0000
    1212@@ -103,7 +103,7 @@ proc rpmpackage_pkg {portname portversio
    13      system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e
    14 's/$/\"/' >> '${workpath}/${portname}.filelist'"
    15      system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config
    16 \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
    17      write_spec ${specpath} $portname $portversion $portrevision $pkg_description
    18 $pkg_long_description $category $maintainer $destpath $dependencies $epoch
     13     system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
     14     system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
     15     write_spec ${specpath} $portname $portversion $portrevision $pkg_description $pkg_long_description $category $maintainer $destpath $dependencies $epoch
    1916-    system "DP_USERECEIPTS='${portdbpath}/receipts' rpm -bb -v ${rpmdestpath} ${specpath}"
    20 +    system "DP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath}
    21 ${specpath}"
     17+    system "DP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath} ${specpath}"
    2218     
    2319     return 0
    2420 }
     21}}}
    2522
    2623I tested this with RPM 4.0.x and RPM 4.1.x (both from Darwinports)