[26470] trunk/base/src/package1.0/portrpmpackage.tcl

source_changes at macosforge.org source_changes at macosforge.org
Mon Jun 25 03:12:37 PDT 2007


Revision: 26470
          http://trac.macosforge.org/projects/macports/changeset/26470
Author:   afb at macports.org
Date:     2007-06-25 03:12:36 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
allow building +universal packages (.fat.rpm)

Modified Paths:
--------------
    trunk/base/src/package1.0/portrpmpackage.tcl

Modified: trunk/base/src/package1.0/portrpmpackage.tcl
===================================================================
--- trunk/base/src/package1.0/portrpmpackage.tcl	2007-06-25 09:27:03 UTC (rev 26469)
+++ trunk/base/src/package1.0/portrpmpackage.tcl	2007-06-25 10:12:36 UTC (rev 26470)
@@ -65,10 +65,16 @@
         set rpmdestpath "--define '_topdir ${pkgpath}'"
     }
     
+    set rpmbuildarch ""
+    if {[variant_isset "universal"]} {
+        set rpmbuildarch "--target fat"
+    }
+    
     foreach dir [list "${prefix}/src/macports/RPMS" "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/macports/rpms/RPMS"] {
         foreach arch {"ppc" "i386" "fat"} {
             set rpmpath "$dir/${arch}/${portname}-${portversion}-${portrevision}.${arch}.rpm"
 	    if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
+                ui_debug "$rpmpath"
                 ui_msg "$UI_PREFIX [format [msgcat::mc "RPM package for %s-%s is up-to-date"] ${portname} ${portversion}]"
                 return 0
             }
@@ -110,7 +116,7 @@
     system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
     system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
     write_spec ${specpath} $portname $portversion $portrevision $pkg_description $pkg_long_description $category $maintainer $destpath $dependencies $epoch
-    system "MP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath} ${specpath}"
+    system "MP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmbuildarch} ${rpmdestpath} ${specpath}"
     
     return 0
 }
@@ -181,11 +187,12 @@
     puts $specfd "
 %description
 ${long_description}
+
 %prep
 %build
 %install
 %clean
-%files -f ${destroot}/../${origportname}.filelist
-"
+
+%files -f ${destroot}/../${origportname}.filelist"
     close $specfd
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070625/45cbaf61/attachment.html


More information about the macports-changes mailing list