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

[source_changes at macosforge.org]

Revision: 26465
          http://trac.macosforge.org/projects/macports/changeset/26465
Author:   afb at macports.org
Date:     2007-06-24 15:30:50 -0700 (Sun, 24 Jun 2007)

Log Message:
-----------
- make rpmpackage work with RPM > 4.4.6
- fix broken RPM package cache ${prefix}
- look in the new topdir name for RPMS
- get rid of the useless "Go MacPorts"

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-24 19:47:32 UTC (rev 26464)
+++ trunk/base/src/package1.0/portrpmpackage.tcl	2007-06-24 22:30:50 UTC (rev 26465)
@@ -65,7 +65,7 @@
         set rpmdestpath "--define '_topdir ${pkgpath}'"
     }
     
-    foreach dir { "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/macports/rpms/RPMS"} {
+    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])} {
@@ -159,6 +159,11 @@
 %define vendor MacPorts
 %define packager ${maintainer}
 
+%define buildroot ${destroot}
+# Avoid cleaning BuildRoot in the pre-install:
+%define __spec_install_pre     %{___build_pre}
+%define __spec_clean_body      %{nil}
+
 Summary: ${description}
 Name: ${portname}
 Version: ${portversion}
@@ -178,7 +183,6 @@
 ${long_description}
 %prep
 %build
-echo \"Go MacPorts\"
 %install
 %clean
 %files -f ${destroot}/../${origportname}.filelist

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070624/66bb108a/attachment.html