Changeset 1121 in MondoRescue for branches/stable/tools

Timestamp:

Feb 9, 2007, 6:49:33 PM (17 years ago)

Author:

Bruno Cornec

Message:

• 1722 Floppies are NOT supported anymore (allows for mindi to become noarch)
• mindi is now a noarch type of package
• RPM Packaging improvements for Fedora

Location:

branches/stable/tools

Files:

• build2pkg (modified) (1 diff)
• pkg2fc (modified) (1 diff)
• pkg2ftp (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/stable/tools/build2pkg

@@ -64 +64 @@
 
     if [  _"$dtype" = _"rpm" ]; then
-        if [ _"$p" = _"mondo-doc" ]; then
+        if [ _"$p" = _"mondo-doc" ] || [ _"$p" = _"mindi" ]; then
             ar="noarch"
         else

branches/stable/tools/pkg2fc

@@ -18 +18 @@
 . $TOOLHOME/distro-env
 . $TOOLHOME/fc-env
+
+export LANGUAGE="C"
 
 # We need to get $VER and $TAG

branches/stable/tools/pkg2ftp

@@ -55 +55 @@
     tag=`cat $MONDOTMP/$pv/TAG`
     if [  _"$dtype" = _"rpm" ]; then
-        if [ _"$p" = _"mondo-doc" ]; then
+        if [ _"$p" = _"mondo-doc" ] || [ _"$p" = _"mindi" ]; then
             ar="noarch"
         else

branches/stable/tools/svn2build

@@ -87 +87 @@
             fi
             m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            if [ _"`/bin/arch`" = _"x86_64" ] && [ $ddir = "rhel" ]; then
+                # Bug on x86_64 on _sysconfdir on rhel4 at least
+                perl -pi -e 's~^export CONFDIR=.*~export CONFDIR=/etc~' $dest/distributions/${ddir}-$dver/$p.spec
+            fi
 
             rm -f $MONDOTMP/$p.spec