[Lunar-commits] <moonbase> rpm: Just a little tweaking.

[Dennis `stumbles` Veatch]

commit 86864421477131ab8443953640adc003ba8b5801
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Thu Sep 10 06:46:30 2009 -0400

    rpm: Just a little tweaking.
---
 zbeta/rpm/BUILD   |   22 ++++++----------------
 zbeta/rpm/DEPENDS |   10 ++++++----
 zbeta/rpm/DETAILS |    2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/zbeta/rpm/BUILD b/zbeta/rpm/BUILD
index 00b048a..2518b78 100644
--- a/zbeta/rpm/BUILD
+++ b/zbeta/rpm/BUILD
@@ -1,22 +1,12 @@
 (
-sed -i -r 's@#if\ defined\(EOWNERDEAD\)@#if\ defined\(EOWNERDEAD\)\ \&\&\ defined\(PTHREAD_MUTEX_ROBUST_NP\)@' \
-db/mutex/mut_pthread.c &&
+
+  sed -i -r 's@#if\ defined\(EOWNERDEAD\)@#if\ defined\(EOWNERDEAD\)\ \&\&\ defined\(PTHREAD_MUTEX_ROBUST_NP\)@' \
+  db/mutex/mut_pthread.c &&
 
   LDFLAGS=$(echo $LDFLAGS | sed  s/"-z combreloc"// )
 
-if module_installed pcre; then
-   OPTS="$OPTS --with-pcre=external"
-fi &&
+  OPTS+=" --without-selinux"
+
+  default_build
 
- ./configure --prefix=/usr  \
-                --localstatedir=/var  \
-                --sysconfdir=/etc  \
-                --libdir=/usr/lib  \
-                --includedir=/usr/include  \
-                --infodir=/usr/share/info  \
-                --without-selinux           \
-                --with-python=no           \
-                --mandir=/usr/share/man \
-                $OPTS &&
- default_make
 ) > $C_FIFO 2>&1
diff --git a/zbeta/rpm/DEPENDS b/zbeta/rpm/DEPENDS
index 5850c46..48f6515 100644
--- a/zbeta/rpm/DEPENDS
+++ b/zbeta/rpm/DEPENDS
@@ -1,7 +1,9 @@
 depends Python
 depends beecrypt
 
-optional_depends "elfutils" "" "" "use external rather than internal elfutils"
-optional_depends "zlib"   ""  ""  "optional for gzipped rpmfiles" 
-optional_depends "bzip2"  ""  ""  "optional for bzip2 compressed rpms" 
-optional_depends "gnupg"  ""  ""  "optional for signed rpm package support"
+optional_depends "elfutils" ""  ""  "use external rather than internal elfutils"
+optional_depends "zlib"     ""  ""  "optional for gzipped rpmfiles" 
+optional_depends "bzip2"    ""  ""  "optional for bzip2 compressed rpms" 
+optional_depends "gnupg"    ""  ""  "optional for signed rpm package support"
+
+optional_depends "pcre"     "--with-pcre=external" "--without-pcre" "for regular expression support"
diff --git a/zbeta/rpm/DETAILS b/zbeta/rpm/DETAILS
index d0e0e02..c4ba63d 100644
--- a/zbeta/rpm/DETAILS
+++ b/zbeta/rpm/DETAILS
@@ -1,6 +1,6 @@
           MODULE=rpm
-         VERSION=5.2.0
            MAJOR=5.2
+         VERSION=${MAJOR}.0
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=http://rpm5.org/files/rpm/rpm-$MAJOR
       SOURCE_VFY=sha1:45031ea461738f081559082d35ce80fcfea822e6