X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=spec2make.c;h=a32f4fdc481b0caef34741fa92469906cae2e38b;hb=f68d0b21b747aba79aa1ac51acf245d1fb6b921b;hp=5b405ed9bc44b28e2a72e374ed427af3c042b1f1;hpb=fb8496f965ebbddd0d4380f1d69d3b41ea10cc7c;p=build.git

diff --git a/spec2make.c b/spec2make.c
index 5b405ed9..a32f4fdc 100644
--- a/spec2make.c
+++ b/spec2make.c
@@ -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;
@@ -184,8 +193,9 @@ main(int argc, char *argv[])
   }
 
   /* 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++) {
@@ -195,6 +205,9 @@ main(int argc, char *argv[])
     }
   }
   
+  /* export arch */
+  printf ("%s.rpm-arch := %s\n",package_name,target);
+
   spec = freeSpec(spec);
 
  done: