[SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (9b46d2c81c6d883793267b3d22f05578b1e736f9)

Arwed v. Merkatz scm at mail.sourcemage.org
Sun Jun 25 10:09:41 EDT 2006


GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz at gmx.net>:

 archive/rpm/DEPENDS   |    1 +
 archive/rpm/DETAILS   |    1 +
 archive/rpm/HISTORY   |    4 ++++
 archive/rpm/PRE_BUILD |    6 +++++-
 4 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9b46d2c81c6d883793267b3d22f05578b1e736f9
Author: Arwed v. Merkatz <v.merkatz at gmx.net>
Commit: Arwed v. Merkatz <v.merkatz at gmx.net>

    rpm: use gcc 3.4, fix python installation

diff --git a/archive/rpm/DEPENDS b/archive/rpm/DEPENDS
index 69cfa9a..682ef37 100755
--- a/archive/rpm/DEPENDS
+++ b/archive/rpm/DEPENDS
@@ -1,2 +1,3 @@
+depends  gcc34      &&
 depends  rpmunpack  &&
 depends  python
diff --git a/archive/rpm/DETAILS b/archive/rpm/DETAILS
index 55bcb09..93c54be 100755
--- a/archive/rpm/DETAILS
+++ b/archive/rpm/DETAILS
@@ -11,6 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
       LICENSE[0]=GPL
        BUILD_API=2
         KEYWORDS="archive"
+     GCC_VERSION=3.4
            SHORT="The RPM Package Manager (RPM)"
 cat << EOF
 The RPM Package Manager (RPM) is a powerful command line driven package management system capable of installing, uninstalling, verifying, querying, and updating computer software packages. Each software package consists of an archive of files along with information about the package like its version, a description, and the like. There is also a related API ("Application Program Interface"), permitting advanced developers to bypass 'shelling out' to a command line, and to manage such transactions from within a native coding language.
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 39bc19c..3141506 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,3 +1,7 @@
+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
+
 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 0e0d824..5882115 100755
--- a/archive/rpm/PRE_BUILD
+++ b/archive/rpm/PRE_BUILD
@@ -1,5 +1,9 @@
+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
+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



More information about the SM-Commit mailing list