- define rpm version from pkg-config

- drop support for antiquated rpm

diff --git a/Makefile b/Makefile
index 992fbaaf8009d6b045a83eac4f0db01d9448eaef..0dcbb6cf386e3f0761806ecfed6f284e8d64596c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ CFLAGS := -Wall -Wno-unused-result $(RPMCFLAGS)
 LDFLAGS := $(RPMLDFLAGS)
 INCLUDES := `pkg-config --cflags rpm`
 LIBS := `pkg-config --libs rpm`
+RPM_FORMAT_VERSION := `pkg-config --modversion rpm | cut -d . -f 1`
+RPM_MAJOR_VERSION := `pkg-config --modversion rpm | cut -d . -f 1`
+RPM_MINOR_VERSION := `pkg-config --modversion rpm | cut -d . -f 1`
 
 rpm-specdump: rpm-specdump.o
        $(CC) $(LDFLAGS) $< -o $@ $(LIBS)

diff --git a/rpm-specdump.c b/rpm-specdump.c
index f1a820001e8a0f74eaec529bd10315ddc10206da..deaa22a5c4982db201c83474f301ddef02083053 100644 (file)
--- a/rpm-specdump.c
+++ b/rpm-specdump.c
@@ -80,24 +80,7 @@
 // macros from kernel
 #define RPM_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
-#if !defined(RPM_FORMAT_VERSION)
-#include <rpmversion.h>
-#if defined(RPMLIB_VERSION) && RPMLIB_VENDOR_EQ('R','P','M','5')
-#      if RPMLIB_VERSION >= RPMLIB_VERSION_ENCODE(5,4,r,0,0,_)
-#              define  RPM_VERSION_CODE RPM_VERSION(5, 4, 0)
-#      elif RPMLIB_VERSION >= RPMLIB_VERSION_ENCODE(5,3,r,0,0,_)
-#              define  RPM_VERSION_CODE RPM_VERSION(5, 3, 0)
-#      elif RPMLIB_VERSION >= RPMLIB_VERSION_ENCODE(5,2,r,0,0,_)
-#              define  RPM_VERSION_CODE RPM_VERSION(5, 2, 0)
-#      elif RPMLIB_VERSION >= RPMLIB_VERSION_ENCODE(5,1,r,0,0,_)
-#              define  RPM_VERSION_CODE RPM_VERSION(5, 1, 0)
-#      elif RPMLIB_VERSION >= RPMLIB_VERSION_ENCODE(5,0,r,0,0,_)
-#              define  RPM_VERSION_CODE RPM_VERSION(5, 0, 0)
-#      endif
-#endif
-#else
-#      define  RPM_VERSION_CODE RPM_VERSION(RPM_FORMAT_VERSION, RPM_MAJOR_VERSION, RPM_MINOR_VERSION)
-#endif
+#define RPM_VERSION_CODE RPM_VERSION(RPM_FORMAT_VERSION, RPM_MAJOR_VERSION, RPM_MINOR_VERSION)
 
 #include <rpmio.h>
 #include <rpmbuild.h>
@@ -118,11 +101,6 @@
 #define ARG_UID                1030
 #define ARG_GID                1031
 
-// RPM 4.4.2
-#if RPM_VERSION_CODE < RPM_VERSION(4,4,9)
-#      define RPMFILE_SOURCE RPMBUILD_ISSOURCE
-#endif
-
 #if !defined(EXIT_FAILURE)
 #      define EXIT_FAILURE 1
 #endif
@@ -243,7 +221,7 @@ parseArgs(struct Arguments *args, int argc, char *argv[])
     int                c = getopt_long(argc, argv, "", CMDLINE_OPTIONS, 0);
     if (c==-1) break;
     switch (c) {
-      case 'h'         :  showHelp(1, argv[0], 0);
+      case 'h'         :  showHelp(1, argv[0], 0); break;
       case ARG_TARGET  :  args->target = optarg; break;
       case ARG_RCFILE  :  args->rcfile = optarg; break;
       case ARG_CHROOT  :  args->chroot = optarg; break;