X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=spec2make.c;h=a32f4fdc481b0caef34741fa92469906cae2e38b;hb=722f124e85aa989be00c94d91d1b44e468f860c9;hp=d9ff98bc7a55f97fcee81503a23d6b0124c10113;hpb=ea8c64fd415283b3e3cadd438d8b19be96261cad;p=build.git

diff --git a/spec2make.c b/spec2make.c
index d9ff98bc..a32f4fdc 100644
--- a/spec2make.c
+++ b/spec2make.c
@@ -6,7 +6,7 @@
  * Mark Huang <mlhuang@cs.princeton.edu>
  * Copyright (C) 2006 The Trustees of Princeton University
  *
- * $Id: spec2make.c 968 2007-11-07 16:15:55Z thierry $
+ * $Id$
  */
 
 #include <stdio.h>
@@ -20,6 +20,15 @@
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmspec.h>
 
+/* from f10 and up, Spec is renamed rpmSpec */
+#ifndef _RPMTYPES_H
+#define rpmSpec Spec
+#endif
+
+#ifndef PATH_MAX
+#include <linux/limits.h>
+#endif
+
 extern size_t strnlen(const char *s, size_t maxlen);
 
 /* the structure describing the options we take and the defaults */
@@ -34,7 +43,7 @@ static struct poptOption optionsTable[] = {
 };
 
 /* Stolen from rpm/build/spec.c:rpmspecQuery() */
-Spec
+rpmSpec
 rpmspecGet(rpmts ts, const char * arg)
 {
   char * buildRoot = NULL;
@@ -59,7 +68,7 @@ main(int argc, char *argv[])
   poptContext context;
   rpmts ts = NULL;
   int ec = 0;
-  Spec spec;
+  rpmSpec spec;
   struct Source *source;
   Package pkg;
   const char *name, *version, *release, *arch, *unused;
@@ -123,7 +132,7 @@ main(int argc, char *argv[])
     char fullSource[PATH_MAX];
 
     strncpy(fullSource, source->fullSource, sizeof(fullSource));
-    printf("%s-TARBALL += SOURCES/%s\n", package_name, basename(fullSource));
+    printf("%s.tarballs += SOURCES/%s\n", package_name, basename(fullSource));
     /* computes the SOURCEDIR variable by removing .tar.gz or .tar.bz2 */
     { 
       char *suffixes[] = {".tar.gz",".tgz",".tar.bz2", NULL};
@@ -135,10 +144,11 @@ main(int argc, char *argv[])
 	suffix_index=strstr(fullSource,*suffix);
 	if (suffix_index) {
 	  char sourcename[PATH_MAX];
-	  strncpy(sourcename,fullSource,suffix_index-fullSource);
-	  *suffix_index='\0';
-	  printf ("%s-SOURCE := SOURCES/%s\n",package_name,basename(sourcename));
-	  printf ("%s-CODEBASE := CODEBASES/%s\n",package_name,package_name);
+	  size_t len = (size_t)(suffix_index-fullSource);
+	  strncpy(sourcename,fullSource,len);
+	  sourcename[len]='\0';
+	  printf ("%s.source := SOURCES/%s\n",package_name,basename(sourcename));
+	  printf ("%s.codebase := CODEBASES/%s\n",package_name,package_name);
 	  break;
 	}
       }
@@ -151,7 +161,7 @@ main(int argc, char *argv[])
   name = version = release = NULL;
   (void) headerNVR(pkg->header, &name, &version, &release);
   if (name && version && release)
-    printf("%s-SRPM := SRPMS/%s-%s-%s.src.rpm\n",
+    printf("%s.srpm := SRPMS/%s-%s-%s.src.rpm\n",
 	   package_name, name, version, release);
 
   /* Print non-empty packages */
@@ -159,31 +169,45 @@ main(int argc, char *argv[])
     name = version = release = arch = NULL;
     (void) headerNEVRA(pkg->header, &name, &unused, &version, &release, &arch);
     if (name && version && release && arch) {
-      if (!pkg->fileList)
-	printf("# Empty\n# ");
-
       if (target != NULL) {
 	if (strcmp(arch,target)!=0) {
 	  arch=target;
 	}
       }
-      printf("%s-RPM += RPMS/%s/%s-%s-%s.%s.rpm\n",
-	     package_name, arch, name, version, release, arch);
+      /* skip empty packages */
+      if (pkg->fileList) {
+	/* attach (add) rpm path to package */
+	printf("%s.rpms += RPMS/%s/%s-%s-%s.%s.rpm\n",
+	       package_name, arch, name, version, release, arch);
+	/* convenience */
+	printf("%s.rpmnames += %s\n",
+	       package_name, name);
+	/* attach path to rpm name */
+	printf("%s.rpm-path := RPMS/%s/%s-%s-%s.%s.rpm\n",
+	       name,arch, name, version, release, arch);
+	/* attach package to rpm name for backward resolution - should be unique */
+	printf("%s.package := %s\n",
+	       name,package_name);
+      }
     }
   }
 
   /* export some macros to make */
+  /* note : this relies on pl-specific conventions and might be wrong */
   { 
-    char *macros[] = { "release" , "name" , "version" , "subversion" , NULL } ;
+    char *macros[] = { "release" , "name" , "version" , "taglevel" , NULL } ;
     char **nav;
     char *macro=malloc(32);
     for (nav=macros; *nav; nav++) {
       sprintf(macro,"%%{%s}",*nav);
       char *value = rpmExpand(macro,NULL);
-      printf ("%s-rpm-%s := %s\n",package_name,*nav,value);
+      printf ("%s.rpm-%s := %s\n",package_name,*nav,value);
     }
   }
   
+  /* export arch */
+  printf ("%s.rpm-arch := %s\n",package_name,target);
+
   spec = freeSpec(spec);
 
  done: