fixed optflags and perl auto-dependencies

- disable perl auto requires, this has been annoying and pulling perl on
  every perl script in any package
- Fixed architecture translations to allow building with correct
  architectures by default

Change-Id: Ifc37c05237daa6e8efa0c12849efa6f4cfa6d3b8

5 files changed, 63 insertions, 352 deletions

diff --git a/packaging/disableperl.patch b/packaging/disableperl.patch
new file mode 100644
index 0000000..f5937b0
--- /dev/null
+++ b/packaging/disableperl.patch
@@ -0,0 +1,18 @@
+Index: rpm-4.9.1/fileattrs/perl.attr
+===================================================================
+--- rpm-4.9.1.orig/fileattrs/perl.attr
++++ rpm-4.9.1/fileattrs/perl.attr
+@@ -1,3 +1,3 @@
+-%__perl_requires	%{_rpmconfigdir}/perl.req
++#%__perl_requires	%{_rpmconfigdir}/perl.req
+ %__perl_magic		^.*perl .*$
+ %__perl_flags		exeonly
+Index: rpm-4.9.1/fileattrs/perllib.attr
+===================================================================
+--- rpm-4.9.1.orig/fileattrs/perllib.attr
++++ rpm-4.9.1/fileattrs/perllib.attr
+@@ -1,3 +1,3 @@
+ %__perllib_provides	%{_rpmconfigdir}/perl.prov
+-%__perllib_requires	%{_rpmconfigdir}/perl.req
++#%__perllib_requires	%{_rpmconfigdir}/perl.req
+ %__perllib_magic	^Perl[[:digit:]] module source.*
diff --git a/packaging/optflags.patch b/packaging/optflags.patch
index a882a98..ac89f49 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-python.changes b/packaging/rpm-python.changes
deleted file mode 100644
index f46dec9..0000000
--- a/packaging/rpm-python.changes
+++ /dev/null
@@ -1,174 +0,0 @@
-* Sat May 21 2011 Anas Nashif <anas.nashif@intel.com> - 4.9.0
-- Update to 4.9.0
-
-* Fri Feb 05 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Fixed python module build
-
-* Thu Jan 28 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Update to 4.8.0 final
-- Remove obsolete patches
-
-* Thu Jan 07 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0~beta1
-- Update to 4.8.0
-- Use ~ for negative versioning of snpashots and pre-releases
-
-* Sat Nov 14 2009 Anas Nashif <anas.nashif@intel.com> - 4.7.1
-- Applied fixed from FC12
-
-* Wed Sep 23 2009 Anas Nashif <anas.nashif@intel.com> - 4.7.1
-- Update to 4.7.1
-- Applied upstream patches
-
-* Sun Apr 19 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- rpm-build now requires moblin-rpm-config
-
-* Sat Feb 21 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Remove topdir patch, use default
-
-* Fri Feb 13 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to final 4.6.0
-
-* Sat Dec 20 2008 Arjan van de Ven <arjan@linux.intel.com> 4.6.0
-- Re-fix the pkgconfig bug
-
-* Thu Dec 18 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to 4.6 rc3
-
-* Thu Dec 11 2008 Arjan van de Ven <arjan@linux.intel.com> 4.6.0
-- Fix the pkgconfig Requires: issue as exposed by cairo
-
-* Thu Dec 04 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to 4.6rc2
-
-* Sun Nov 30 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- fix packageconfig auto dependencies
-
-* Mon Nov 24 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- split package to avoid long build time
-
-* Fri Nov 21 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- use external db 4.7
-
-* Tue Oct 28 2008 Panu Matilainen <pmatilai@redhat.com>
-- Florian's improved fingerprinting hash algorithm from upstream
-
-* Sat Oct 25 2008 Panu Matilainen <pmatilai@redhat.com>
-- Make noarch sub-packages actually work
-- Fix defaultdocdir logic in installplatform to avoid hardwiring mandir
-
-* Fri Oct 24 2008 Jindrich Novy <jnovy@redhat.com>
-- update compat-db dependencies (#459710)
-
-* Wed Oct 22 2008 Panu Matilainen <pmatilai@redhat.com>
-- never add identical NEVRA to transaction more than once (#467822)
-
-* Sun Oct 19 2008 Panu Matilainen <pmatilai@redhat.com>
-- permit tab as macro argument separator (#467567)
-
-* Thu Oct 16 2008 Panu Matilainen <pmatilai@redhat.com>
-- update to 4.6.0-rc1 
-- fixes #465586, #466597, #465409, #216221, #466503, #466009, #463447...
-- avoid using %%configure macro for now, it has unwanted side-effects on rpm
-
-* Wed Oct 01 2008 Panu Matilainen <pmatilai@redhat.com>
-- update to official 4.5.90 alpha tarball 
-- a big pile of misc bugfixes + translation updates
-- isa-macro generation fix for ppc (#464754)
-- avoid pulling in pile of perl dependencies for an unused script
-- handle both "invalid argument" and clear env version mismatch on posttrans
-
-* Thu Sep 25 2008 Jindrich Novy <jnovy@redhat.com>
-- don't treat %patch numberless if -P parameter is present (#463942)
-
-* Thu Sep 11 2008 Panu Matilainen <pmatilai@redhat.com>
-- add hack to support extracting gstreamer plugin provides (#438225)
-- fix another macro argument handling regression (#461180)
-
-* Thu Sep 11 2008 Jindrich Novy <jnovy@redhat.com>
-- create directory structure for rpmbuild prior to build if it doesn't exist (#455387)
-- create _topdir if it doesn't exist when installing SRPM
-- don't generate broken cpio in case of hardlink pointing on softlink,
-  thanks to pixel@mandriva.com
-
-* Sat Sep 06 2008 Jindrich Novy <jnovy@redhat.com>
-- fail hard if patch isn't found (#461347)
-
-* Mon Sep 01 2008 Jindrich Novy <jnovy@redhat.com>
-- fix parsing of boolean expressions in spec (#456103)
-  (unbreaks pam, jpilot and maybe other builds)
-
-* Tue Aug 26 2008 Jindrich Novy <jnovy@redhat.com>
-- add support for noarch subpackages
-- fix segfault in case of insufficient disk space detected (#460146)
-
-* Wed Aug 13 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8461.2
-- fix archivesize tag generation on ppc (#458817)
-
-* Fri Aug 08 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8461.1
-- new snapshot from upstream
-- fixes #68290, #455972, #446202, #453364, #456708, #456103, #456321, #456913,
-  #458260, #458261
-- partial fix for #457360
-
-* Thu Jul 31 2008 Florian Festi <ffesti@redhat.com>
-- 4.5.90-0.git8427.1
-- new snapshot from upstream
-
-* Thu Jul 31 2008 Florian Festi <ffesti@redhat.com>
-- 4.5.90-0.git8426.10
-- rpm-4.5.90-posttrans.patch
-- use header from rpmdb in posttrans to make anaconda happy
-
-* Sat Jul 19 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8426.9
-- fix regression in patch number handling (#455872)
-
-* Tue Jul 15 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8426.8
-- fix regression in macro argument handling (#455333)
-
-* Mon Jul 14 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8426.7
-- fix mono dependency extraction (adjust for libmagic string change)
-
-* Sat Jul 12 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8426.6
-- fix type mismatch causing funky breakage on ppc64
-
-* Fri Jul 11 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8426.5
-- flip back to external bdb
-- fix tab vs spaces complaints from rpmlint
-- add dep for lzma and require unzip instead of zip in build (#310694)
-- add pkgconfig dependency to rpm-devel
-- drop ISA-dependencies for initial introduction
-- new snapshot from upstream for documentation fixes
-
-* Thu Jul 10 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8424.4
-- handle int vs external db in posttrans too
-
-* Wed Jul 08 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8424.3
-- require curl as external url helper
-
-* Wed Jul 08 2008 Panu Matilainen <pmatilai@redhat.com>
-- 4.5.90-0.git8424.2
-- add support for building with or without internal db
-
-* Wed Jul 08 2008 Panu Matilainen <pmatilai@redhat.com>
-- rpm 4.5.90-0.git8424.1 (alpha snapshot)
-- adjust to build against Berkeley DB 4.5.20 from compat-db for now
-- add posttrans to clean up db environment mismatch after upgrade
-- forward-port devel autodeps patch
-
-* Tue Jul 08 2008 Panu Matilainen <pmatilai@redhat.com>
-- adjust for rpmdb index name change
-- drop unnecessary vendor-macro patch for real
-- add ISA-dependencies among rpm subpackages
-- make lzma and sqlite deps conditional and disabled by default for now
-
-* Fri Feb 01 2008 Panu Matilainen <pmatilai@redhat.com>
-- spec largely rewritten, truncating changelog
diff --git a/packaging/rpm.changes b/packaging/rpm.changes
index dc8e34b..3f1ecbb 100644
--- a/packaging/rpm.changes
+++ b/packaging/rpm.changes
@@ -1,170 +1,25 @@
-* Wed Jun 20 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Removing unnessesary PRE/POST PSM calls while executing pre/posttrans scripts
-- Adding the check for the empty domain name in define
+* Thu Jun 21 2012 Anas Nashif <anas.nashif@intel.com> c290eab
+- disable perl auto requires
+- fixed optflags
 
-* Fri Jun 15 2012 Ryan Ware <ware@linux.intel.com> - 4.9.0
-- Trigger build
+* Wed Jun 20 2012 Elena, Reshetova <elena.reshetova@intel.com> dd9dc00
+- fixing pre/posttrans scripts calls and plugin
 
-* Fri Jun 08 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Fixing rpm-security-plugin bugs (PTSEC-19, PTSEC-20, PTSEC-21)
+* Fri Jun 15 2012 Ryan Ware <ryan.r.ware@intel.com> bf466c3
+- Version 4.9.0, release to OBS
 
-* Tue May 29 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Fixng rpm-security-plugin dependencies
-- Adding fixes for executables handling in plugin
+* Tue Jun 12 2012 Elena, Reshetova <elena.reshetova@intel.com> 733aadb
+- Fixng rpm-security-plugin bugs (PTSEC-19, PTSEC-20, PTSEC-21)
 
-* Tue Apr 24 2012 Elena Reshetova <elena.reshetova@intel.com> - 4.9.0
-- Adding the fixes to rpm security:
- - Handling the policy
- - Log output
- - Handling of exec and normal labels at the same time
+* Wed May 30 2012 Ryan Ware <ryan.r.ware@intel.com> 91057db
+- Add default Smack manifest for rpm.spec
+- Add default Smack manifest for rpm-python.spec
 
-* Tue Jun 07 2011 Anas Nashif <anas.nashif@intel.com> - 4.9.0
-- Cleanup spec file
-- Split locale files
+* Tue May 29 2012 Elena, Reshetova <elena.reshetova@intel.com> 3257c01
+- adding fixes for exec label handling and fixing plugin dependencies
 
-* Fri May 27 2011 Anas Nashif <anas.nashif@intel.com> - 4.9.0
-- Refine script for splitting documentation
-
-* Sat May 21 2011 Anas Nashif <anas.nashif@intel.com> - 4.9.0
-- Update to 4.9.0
-
-* Thu May 19 2011 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Split sources of debuginfo packages into debugsource sub packages
-- Added macros to enable splitting of translations and documentation
-- Package only supported languages
-
-* Thu Mar 10 2011 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Remove MSSF patches for now
-
-* Fri Feb 25 2011 Ilhan Gurel <ilhan.gurel@nokia.com> - 4.8.1
-- Apply MSSF patches
-- Fixes for Coverity defects
-
-* Fri Feb 04 2011 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Apply to upstream patches on top of 4.8.1:
-  - Enable dbenv->failchk() functionality on BDB >= 5.0 too
-  - Eliminate leftover checks for Berkeley DB < 4.3 compatibility
-
-* Mon Jan 24 2011 Carsten Munk <carsten@maemo.org>
-- Merge arch.patch and armv7nhl-armv7hl patch. 
-- Add thumb subarch support, BMC#12622
-
-* Thu Jan 20 2011 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- [FEA] RPM plug-in support (FEA #9095)
-- Partly implements FEA #9097: Package labeling
-- Add and enable MSSF support
-
-* Tue Jan 11 2011 Carsten Munk <carsten@maemo.org> - 4.8.1
-- armv7hl patch didn't contain %arm addition in macros
-  and installplatform.in changes for some reason. BMC#11429
-
-* Mon Jan 10 2011 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Fixed bmc #5546: include rpm.spec in rpm-python
-
-* Fri Dec 17 2010 Carsten Munk <carsten@maemo.org> - 4.8.1
-- Added armv7hl and armv7nhl architectures, fixing BMC#11428
-- Remove project.diff
-
-* Fri Jul 02 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Removed unused BuildRequires and macros
-- removed old requirement on moblin-rpm-config in python spec file
-
-* Sun Jun 20 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.1
-- Update to 4.8.1
-  Security:
-    * Remove SUID/SGID bits from hardlinked executables on upgrade too
-      (CVE-2010-2059, RhBug:598775) [1]
-    * Remove POSIX capabilities from hardlinked executables on upgrade and
-      erase (CVE-2010-2059?, RhBug:598775)
-
-  General bugfixes and enhancements:
-    * Fix "empty reply from server" curl-syndrome with URL retrieval,
-      regression introduced in 4.6.0 (RhBug:598988)
-    * Fix transaction hanging on unrelated filesystems (RhBug:547548)
-    * Fix crash on URL retrieve to read-only location on install (RhBug:557118)
-    * Fix verification error code not to depend on verbosity
-      level (RhBug:557101)
-    * Fix return from chroot() on verify (RhBug:590588)
-    * Permit DOS-style line-endings in PGP ASCII armors (RhBug:532992)
-    * Fix :pgpsig header format extension sometimes showing numbers for
-      known hash types (RhBug:587755)
-    * Fix :deptype header format extension failing to show some flag
-      combinations
-    * Fix error message on package conflicts against installed packages
-    * Fix erased packages causing misleading disk-space checking
-      messages (RhBug:561160)
-    * Document --conflicts option in manpage (ticket #126)
-
-  Package building:
-    * Fix %defattr(-) syntax, regression introduced in  (SuseBug:594310)
-    * Fix spec parser eating empty lines in %prep section, regression
-      introduced in 4.6.0 (RhBug:573339)
-    * Fix NOSOURCE/NOPATCH tag generation of nosrc packages, regression
-      introduced in 4.6.0
-    * Fix crash in the spec parser (RhBug:597835, SuseBug:582599)
-    * Fix copying of translated tags into source rpms (RhBug:578299)
-    * Only extract dependencies from .desktop files with Type=Application
-      and Exec= entries (ticket #150)
-    * Work around GNU tar debug output breaking rpmbuild -t (SuseBug:558475)
-
-* Tue Apr 06 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Do not use %configure which replaces all variables in the platform
-  macros (BMC#507)
-
-* Fri Mar 26 2010 Arjan van de Ven <arjan@linux.intel.com> - 4.8.0
-- fix the perl dep script to deal with an epoch-less perl
-
-* Thu Mar 04 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Detect MeeGo release, set MeeGo as vendor
-
-* Fri Feb 05 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Fixed python module build
-
-* Fri Feb 05 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Fixed python module build
-
-* Thu Jan 28 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0
-- Update to 4.8.0 final
-- Remove obsolete patches
-
-* Thu Jan 07 2010 Anas Nashif <anas.nashif@intel.com> - 4.8.0~beta1
-- Update to 4.8.0
-- Use ~ for negative versioning of snpashots and pre-releases
-
-* Sat Nov 14 2009 Anas Nashif <anas.nashif@intel.com> - 4.7.1
-- Applied fixed from FC12
-
-* Wed Sep 23 2009 Anas Nashif <anas.nashif@intel.com> - 4.7.1
-- Update to 4.7.1
-- Applied upstream patches
-
-* Sun Apr 19 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- rpm-build now requires moblin-rpm-config
-
-* Sat Feb 21 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Remove topdir patch, use default
-
-* Fri Feb 13 2009 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to final 4.6.0
-
-* Sat Dec 20 2008 Arjan van de Ven <arjan@linux.intel.com> 4.6.0
-- Re-fix the pkgconfig bug
-
-* Thu Dec 18 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to 4.6 rc3
-
-* Thu Dec 11 2008 Arjan van de Ven <arjan@linux.intel.com> 4.6.0
-- Fix the pkgconfig Requires: issue as exposed by cairo
-
-* Thu Dec 04 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- Update to 4.6rc2
-
-* Sun Nov 30 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- fix packageconfig auto dependencies
-
-* Mon Nov 24 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- split package to avoid long build time
-
-* Fri Nov 21 2008 Anas Nashif <anas.nashif@intel.com> 4.6.0
-- use external db 4.7
+* Mon May 21 2012 Kim Kibum <kb0929.kim@samsung.com> dec48cf
+- Upload Tizen:Base source
+[ Hyesook Choi ]
+- Initial empty repository
 
diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index cdac4f1..fb4a4db 100644
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -45,6 +45,7 @@ Patch84:        rpmbuild_rpmfc_4.9.1_fix.patch
 Patch85:        rpmio_base64_4.9.1_fix.patch
 Patch86:        rpmlib_format_value_4.9.1_fix.patch
 Patch87:        security_4.9.1.patch
+Patch90:        disableperl.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@@ -53,7 +54,7 @@ License:        GPLv2+
 
 Requires:       curl
 
-BuildRequires:  bzip2-devel >= 0.9.0c-2
+BuildRequires:  bzip2-devel >= 1.0.6
 BuildRequires:  elfutils-devel >= 0.112
 BuildRequires:  elfutils-libelf-devel
 BuildRequires:  libfile-devel
@@ -180,7 +181,7 @@ rm -f rpmdb/db.h
 %patch85 -p1
 %patch86 -p1
 %patch87 -p1 -b .msm
-
+%patch90 -p1
 
 
 rm -f m4/libtool.m4