diff options
| -rw-r--r-- | packaging/optflags.patch | 37 | ||||
| -rw-r--r-- | packaging/rpm.changes | 8 | ||||
| -rw-r--r-- | packaging/rpm.spec | 4 |
3 files changed, 32 insertions, 17 deletions
diff --git a/packaging/optflags.patch b/packaging/optflags.patch index eb90e94..d38ed6d 100644 --- a/packaging/optflags.patch +++ b/packaging/optflags.patch @@ -1,7 +1,7 @@ -Index: rpm-4.9.0/rpmrc.in +Index: rpm-4.9.1/rpmrc.in =================================================================== ---- rpm-4.9.0.orig/rpmrc.in -+++ rpm-4.9.0/rpmrc.in +--- rpm-4.9.1.orig/rpmrc.in ++++ rpm-4.9.1/rpmrc.in @@ -12,10 +12,10 @@ # "fat" binary with both archs, for Darwin optflags: fat -O2 -g -arch i386 -arch ppc @@ -49,18 +49,29 @@ Index: rpm-4.9.0/rpmrc.in optflags: atarist -O2 -g -fomit-frame-pointer optflags: atariste -O2 -g -fomit-frame-pointer -@@ -218,10 +219,10 @@ buildarchtranslate: athlon: i386 - buildarchtranslate: geode: i386 - buildarchtranslate: pentium4: i386 - buildarchtranslate: pentium3: i386 +@@ -209,17 +210,17 @@ os_canon: MacOSX: macosx 21 + ############################################################# + # For a given uname().machine, the default build arch + +-buildarchtranslate: osfmach3_i686: i386 +-buildarchtranslate: osfmach3_i586: i386 ++buildarchtranslate: osfmach3_i686: i586 ++buildarchtranslate: osfmach3_i586: i586 + buildarchtranslate: osfmach3_i486: i386 + buildarchtranslate: osfmach3_i386: i386 + +-buildarchtranslate: athlon: i386 +-buildarchtranslate: geode: i386 +-buildarchtranslate: pentium4: i386 +-buildarchtranslate: pentium3: i386 -buildarchtranslate: i686: i386 -buildarchtranslate: i586: i386 --buildarchtranslate: i486: i386 --buildarchtranslate: i386: i386 ++buildarchtranslate: athlon: i586 ++buildarchtranslate: geode: i586 ++buildarchtranslate: pentium4: i586 ++buildarchtranslate: pentium3: i586 +buildarchtranslate: i686: i586 +buildarchtranslate: i586: i586 -+buildarchtranslate: i486: i586 -+buildarchtranslate: i386: i586 + buildarchtranslate: i486: i386 + buildarchtranslate: i386: i386 - buildarchtranslate: alphaev5: alpha - buildarchtranslate: alphaev56: alpha diff --git a/packaging/rpm.changes b/packaging/rpm.changes index c5fac79..fa42028 100644 --- a/packaging/rpm.changes +++ b/packaging/rpm.changes @@ -1,3 +1,8 @@ +* Thu Jan 17 20:11:27 UTC 2013 - tracy.graydon@intel.com +- Cherry-pick 6863478fddde08f15ef1368267a9f52d1b3e1ada from 1.0_post branch to fix optflags.patch. +- Resolve conflicts with changelog and spec file resulting from cherry-pick +- Fixes DEVT-41 + * Thu Sep 6 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0 - Changes to the security plugin - Using libmagic instead of file utility to check file's content @@ -68,9 +73,6 @@ * Mon Jun 25 2012 Anas Nashif <anas.nashif@intel.com> 70cc161 - require bzip2-devel >= 1.0.5 -* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> 6863478 -- fixed optflags and perl auto-dependencies - * Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> c290eab - disable perl auto requires - fixed optflags diff --git a/packaging/rpm.spec b/packaging/rpm.spec index b83d13b..e5c37c8 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -1,7 +1,6 @@ # run internal testsuite? %bcond_without check - Name: rpm Version: 4.9.1 Release: 4 @@ -180,7 +179,10 @@ rm -f rpmdb/db.h %patch86 -p1 %patch87 -p1 -b .msm %patch90 -p1 +<<<<<<< HEAD %patch100 -p1 +======= +>>>>>>> 6863478... fixed optflags and perl auto-dependencies rm -f m4/libtool.m4 |