aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-05-01 21:45:18 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2005-05-01 21:45:18 +0000
commitaa1615c529682bf9f38a3f0569de24e71f8b2ded (patch)
tree038f3e8c2ff599a41c2031bf46a595f1883d464b
parentdb95cf3f46a569a97c3d7ab231e975a7d32c4f44 (diff)
- fix optflags
-rw-r--r--configure.ac6
-rw-r--r--make_macrosfiles.sh.in8
-rw-r--r--rpm-mandriva-setup.spec6
3 files changed, 12 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index ef82013..bdb811f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 0.1, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 0.2, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
@@ -17,10 +17,10 @@ AC_CONFIG_FILES([
case "${target_cpu}" in
*86|athlon|k6)
- RPMALLARCH="i386 i436 i586 i686 k6 athlon"
+ RPMALLARCH="i386 i486 i586 i686 k6 athlon"
;;
x86_64|amd64)
- RPMALLARCH="i386 i436 i586 i686 k6 athlon amd64 x86_64"
+ RPMALLARCH="i386 i486 i586 i686 k6 athlon amd64 x86_64"
;;
ppc|powerpc)
RPMALLARCH="ppc"
diff --git a/make_macrosfiles.sh.in b/make_macrosfiles.sh.in
index 12bf942..93fd0be 100644
--- a/make_macrosfiles.sh.in
+++ b/make_macrosfiles.sh.in
@@ -49,18 +49,22 @@ case $ARCH in
CANONARCH=s390x
LIB=lib64;
MULTILIBNO=2 ;;
+ *)
+ CANONARCH=$ARCH
+ LIB=lib
+ ;;
esac
if [ -n "$MULTILIBNO" ]; then
MULTILIBSED='-e /^@MULTILIB/d -e s,@MULTILIBNO@,'$MULTILIBNO,
else
- MULTILIBSED='/^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
+ MULTILIBSED='-e /^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
fi
if [ -n "$OPTFLAGS" ]; then
OPTFLAGSSED="s/@RPMOPTFLAGS@/${OPTFLAGS}/g"
else
- OPTFLAGSSED='-e s,^%optflags.*,,'
+ OPTFLAGSSED='s,^%optflags.*,,'
fi
cat "$MINPUT" | sed \
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 647b8eb..d4ef2b1 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,6 +1,6 @@
%define name rpm-mandriva-setup
-%define version 0.1
-%define release %mkrel 1
+%define version 0.2
+%define release %mkrel 0.1
Summary: The Mandriva rpm configuration and scripts
Name: %{name}
@@ -37,6 +37,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/rpm/macros.d
%changelog
-* Wed Apr 27 2005 Olivier Thauvin <nanardon@mandriva.org> 0.0.1-1mdk
+* Wed Apr 27 2005 Olivier Thauvin <nanardon@mandriva.org> 0.1-1mdk
- First mandriva spec