Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ea1cebb7ae1df09936e8e957a1aa55ca14df6b5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ea1cebb7ae1df09936e8e957a1aa55ca14df6b5)
  • Date: Tue, 4 Jul 2006 06:54:11 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

archive/rpm/BUILD | 13 +++----------
archive/rpm/CONFIGURE | 2 ++
archive/rpm/DEPENDS | 18 +++++++++++++++---
archive/rpm/DETAILS | 14 ++++++--------
archive/rpm/HISTORY | 21 +++++++++++++++++++++
archive/rpm/PRE_BUILD | 19 ++++++++++---------
6 files changed, 57 insertions(+), 30 deletions(-)

New commits:
commit 3ea1cebb7ae1df09936e8e957a1aa55ca14df6b5
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

rpm 4.4.6
(cherry picked from 90267756457fbfea1da248fe5018663d26177c46 commit)

diff --git a/archive/rpm/BUILD b/archive/rpm/BUILD
index 4e8495c..9e2528e 100755
--- a/archive/rpm/BUILD
+++ b/archive/rpm/BUILD
@@ -1,11 +1,4 @@
-# gcc 3.4 fix
-local name &&
-for name in elfutils/*/Makefile.in; do
- sedit 's/-Werror//' $name
-done &&
export LDFLAGS=${LDFLAGS/-z combreloc/} &&
-export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python|
cut -c 1-3)" &&
-./configure --prefix=${INSTALL_ROOT}/usr &&
-make_single &&
-make &&
-make_normal
+OPTS="$OPTS --disable-static $RPM_API $RPM_SELINUX
--with-libintl-prefix=/usr" &&
+#export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python|
cut -c 1-3)" &&
+default_build
diff --git a/archive/rpm/CONFIGURE b/archive/rpm/CONFIGURE
new file mode 100755
index 0000000..c029cb7
--- /dev/null
+++ b/archive/rpm/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option RPM_SELINUX "selinux support?" n "--with-selinux"
"--without-selinux"
+config_query_option RPM_API "build API docs?" n"--with-apidocs"
"--without-apidocs"
diff --git a/archive/rpm/DEPENDS b/archive/rpm/DEPENDS
index 682ef37..c833e08 100755
--- a/archive/rpm/DEPENDS
+++ b/archive/rpm/DEPENDS
@@ -1,3 +1,15 @@
-depends gcc34 &&
-depends rpmunpack &&
-depends python
+depends zlib &&
+depends bzip2 &&
+depends sqlite &&
+depends db &&
+depends gnupg &&
+depends popt &&
+depends elfutils &&
+depends neon &&
+depends file &&
+depends gettext &&
+depends beecrypt &&
+optional_depends gettext "NLS support" "--enable-nls"
"--disable-nls" &&
+optional_depends python "--with-python" "--without-python" "python
bindings" &&
+optional_depends perl "--with-perl" "--without-perl" "perl
bindings" &&
+optional_depends lua "--with-lua" "--without-lua" "lua support"

diff --git a/archive/rpm/DETAILS b/archive/rpm/DETAILS
index a6e03f1..fb3bdbe 100755
--- a/archive/rpm/DETAILS
+++ b/archive/rpm/DETAILS
@@ -1,13 +1,11 @@
SPELL=rpm
- VERSION=4.2-1
- RPM_VERSION=${VERSION%-*}
- SOURCE=$SPELL-$VERSION.src.rpm
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$RPM_VERSION
- SOURCE_URL[0]=ftp://ftp.rpm.org/pub/rpm/dist/rpm-$RPM_VERSION.x/$SOURCE
-
SOURCE_HASH=sha512:c2ce5fbec1a3ff2911cd07c8f61ec5a74e5c77817df6e7647c68afe635f0db277ae2a625f4ea5a91e32c7d6fbfe169fd4118d96e4bd9e2be89e4ecee38294294
- WEB_SITE=http://www.rpm.org/
+ VERSION=4.4.6
+
SOURCE_HASH=sha512:54b8fe773333ef071aeb6735d92e5b3d25f89349928eefd22f89efdf6c6782c0c7854fdf4c4db70fe0ed8e96e6edfb34d7b87f75105308c80161769e4586eb2b
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=ftp://jbj.org/pub/rpm-4.4.x/$SOURCE
+ WEB_SITE=ftp://jbj.org/pub/rpm-4.4.x
ENTERED=20030123
- UPDATED=20030506
LICENSE[0]=GPL
KEYWORDS="archive"
GCC_VERSION=3.4
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index c69cbd9..79290a3 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,3 +1,19 @@
+2006-06-29 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 4.4.6
+ new WEB_SITE and URL
+ use .tar.gz, instead of .src.rpm
+ * BUILD: remove various fixes
+ use default_build
+ don't build statics
+ * PRE_BUILD: use default_pre_build
+ remove some subdirs
+ run autogen.sh
+ this allows use of system libraries
+ * DEPENDS: remove rpmunpack, gcc34
+ add several dependencies
+ * CONFIGURE: add
+ allow optional selinux and apidocs
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

@@ -5,6 +21,11 @@
* DETAILS, DEPENDS, PRE_BUILD: use gcc 3.4, bug #12754
* PRE_BUILD: fixed target dir in python Makefiles

+2006-06-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS, DEPENDS, PRE_BUILD: use gcc 3.4, bug #12754
+ * PRE_BUILD: fixed target dir in python Makefiles
+
+>>>>>>> .merge_file_NXJa26
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/archive/rpm/PRE_BUILD b/archive/rpm/PRE_BUILD
index 5882115..0c9c8c4 100755
--- a/archive/rpm/PRE_BUILD
+++ b/archive/rpm/PRE_BUILD
@@ -1,9 +1,10 @@
-invoke_gcc &&
-unpack_file &&
-rm -f $SPELL-$RPM_VERSION.spec &&
-mk_source_dir $SOURCE_DIRECTORY &&
-tar -xzf $SPELL-$RPM_VERSION.tar.gz &&
-rm $SPELL-$RPM_VERSION.tar.gz &&
-# this used a completely broken way to determine the target dir
-sedit "s:pylibdir =.*:pylibdir = /usr/lib/python$(installed_version python|
cut -d. -f1,2):" $SOURCE_DIRECTORY/python/rpmdb/Makefile.in &&
-sedit "s:pylibdir =.*:pylibdir = /usr/lib/python$(installed_version python|
cut -d. -f1,2):" $SOURCE_DIRECTORY/python/Makefile.in
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# use system copies of these libraries
+rm -r popt sqlite zlib db db3 file intl lua &&
+sedit \
+"s/DB=1/DB=/;/AC_CONFIG_SUBDIRS/D;s/=db3/=/;/lua\//D;s/TEXT/TEXT(external)/;s|intl/Makefile||"
\
+ configure.ac &&
+sedit "s/intl//;s/lua//" Makefile.am &&
+./autogen.sh --noconfigure &&
+autoreconf



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3ea1cebb7ae1df09936e8e957a1aa55ca14df6b5), Treeve Jelbert, 07/04/2006

Archive powered by MHonArc 2.6.24.

Top of Page