adjust building for ac

diff --git a/rpm-macros-ac.patch b/rpm-macros-ac.patch
index c1a91c6316c9c707b2fb03eb7d2ce72019aed757..612310c071dc7712f8ffa2e92aa83206afad4439 100644 (file)
--- a/rpm-macros-ac.patch
+++ b/rpm-macros-ac.patch
@@ -1,14 +1,5 @@
---- rpm-4.5/macros.in~ 2011-10-01 14:15:08.000000000 +0300
-+++ rpm-4.5/macros.in  2011-10-01 14:55:12.132616372 +0300
-@@ -198,7 +198,7 @@
- Summary: Debug information for package %{name}\
- Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
- Group: Development/Debug\
--Requires: filesystem-debuginfo >= 3.0-16\
-+Requires: filesystem-debuginfo >= 2.0-7\
- AutoReqProv: 0\
- %description debuginfo\
- This package provides debug information for package %{name}.\
+--- rpm-4.5/macros.in~ 2012-11-08 05:26:29.000000000 +0200
++++ rpm-4.5/macros.in  2012-11-08 05:27:22.400874103 +0200
 @@ -243,8 +243,8 @@
  %_srcrpmdir           %{_topdir}/SRPMS
  
@@ -38,18 +29,11 @@
  
  #==============================================================================
  # ---- config.guess platform macros.
-@@ -1475,16 +1475,18 @@
- #%__executable_provides       %{_rpmhome}/executabledeps.sh --provides
- #%__executable_requires       %{_rpmhome}/executabledeps.sh --requires
- #%__scriptlet_requires        /bin/bash --rpm-requires
--
- # PLD rpm macros
- %_enable_debug_packages 1
- 
+@@ -1482,9 +1482,12 @@
  #-----------------------------------------------------------------
  # CFLAGS and LDFLAGS used to build
  
--%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-3 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
+-%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-4 -fno-debug-types-section -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
 +%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
  
  %debugcflags  -O0 -g -Wall

diff --git a/rpm-rpmrc-ac.patch b/rpm-rpmrc-ac.patch
index 8b67352a63a31600210387707201877fef3375f9..211f4ff7ee0c14f3aaeacca9c663e72cfc1ea2a6 100644 (file)
--- a/rpm-rpmrc-ac.patch
+++ b/rpm-rpmrc-ac.patch
@@ -1,68 +1,70 @@
---- rpm-4.4.9/rpmrc.in~        2008-01-10 12:40:27.020788566 +0200
-+++ rpm-4.4.2/rpmrc.in 2007-11-27 23:25:28.577554219 +0200
-@@ -13,67 +13,65 @@
+--- rpm-4.5/rpmrc.in   2012-11-08 06:17:32.212324719 +0200
++++ rpm-4.5.old/rpmrc.in       2012-11-08 05:23:23.857653202 +0200
+@@ -13,69 +13,65 @@
  # Values for RPM_OPT_FLAGS for various platforms
  
  # "fat" binary with both archs, for Darwin
--optflags: fat -O2 -arch i386 -arch ppc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_fat: %{specflags_fat}}}
+-optflags: fat -O2 -g -arch i386 -arch ppc
 +optflags: fat -O2 -arch i386 -arch ppc %{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_fat: %{specflags_fat}}}
  
--optflags: i386 -O2 -fno-strict-aliasing -fwrapv -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
--optflags: i486 -O2 -fno-strict-aliasing -fwrapv -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
--optflags: i586 -O2 -fno-strict-aliasing -fwrapv -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
--optflags: i686 -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}}
--optflags: pentium3 -O2 -fno-strict-aliasing -fwrapv -march=pentium3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium3: %{specflags_pentium3}}}
--optflags: pentium4 -O2 -fno-strict-aliasing -fwrapv -march=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium4: %{specflags_pentium4}}}
--optflags: athlon -O2 -fno-strict-aliasing -fwrapv -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}}
--optflags: ia64 -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}}
--optflags: x86_64 -O2 -fno-strict-aliasing -fwrapv -march=x86-64%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}}
--optflags: amd64 -O2 -fno-strict-aliasing -fwrapv -march=k8%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}}
--optflags: ia32e -O2 -fno-strict-aliasing -fwrapv -march=nocona%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32e: %{specflags_ia32e}}}
+-optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
+-optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables
+-optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables
+-optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
+-optflags: pentium3 -O2 -g -m32 -march=pentium3 -fasynchronous-unwind-tables
+-optflags: pentium4 -O2 -g -m32 -march=pentium4 -fasynchronous-unwind-tables
+-optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables
+-optflags: ia64 -O2 -g
+-optflags: x86_64 -O2 -g -m64 -mtune=generic
+-optflags: amd64 -O2 -g -m64 -mtune=generic
+-optflags: ia32e -O2 -g -m64 -mtune=generic
 -
--optflags: alpha -O2 -fno-strict-aliasing -fwrapv -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}}
--optflags: alphaev5 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}}
--optflags: alphaev56 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev56: %{specflags_alphaev56}}}
--optflags: alphapca56 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=pca56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphapca56: %{specflags_alphapca56}}}
--optflags: alphaev6 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev6%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev6: %{specflags_alphaev6}}}
--optflags: alphaev67 -O2 -fno-strict-aliasing -fwrapv -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}}
+-optflags: alpha -O2 -g -mieee
+-optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
+-optflags: alphaev56 -O2 -g -mieee -mcpu=ev56
+-optflags: alphapca56 -O2 -g -mieee -mcpu=pca56
+-optflags: alphaev6 -O2 -g -mieee -mcpu=ev6
+-optflags: alphaev67 -O2 -g -mieee -mcpu=ev67
 -
--optflags: sparc -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=v7 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}}
--optflags: sparcv8 -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=v8 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv8: %{specflags_sparcv8}}}
--optflags: sparcv9 -O2 -fno-strict-aliasing -fwrapv -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}}
--optflags: sparc64 -O2 -fno-strict-aliasing -fwrapv -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
+-optflags: sparc -O2 -g -m32 -mcpu=v7 -mtune=ultrasparc
+-optflags: sparcv8 -O2 -g -m32 -mcpu=v8 -mtune=ultrasparc
+-optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc
+-optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc
 -
--optflags: m68k -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}}
+-optflags: m68k -O2 -g -fomit-frame-pointer
 -
--optflags: ppc -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}}
--optflags: ppc8260 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8260: %{specflags_ppc8260}}}
--optflags: ppc8560 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc8560: %{specflags_ppc8560}}}
--optflags: ppc32dy4 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc32dy4: %{specflags_ppc32dy4}}}
--optflags: ppciseries -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppciseries: %{specflags_ppciseries}}}
--optflags: ppcpseries -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}}
--optflags: ppc64 -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc64: %{specflags_ppc64}}}
+-optflags: ppc -O2 -g -m32
+-optflags: ppc8260 -O2 -g -m32
+-optflags: ppc8560 -O2 -g -m32
+-optflags: ppc32dy4 -O2 -g -m32
+-optflags: ppciseries -O2 -g -m32
+-optflags: ppcpseries -O2 -g -m32
+-optflags: ppc64 -O2 -g -m64 -mminimal-toc
+-optflags: ppciseries -O2 -g -m64 -mminimal-toc
+-optflags: ppcpseries -O2 -g -m64 -mminimal-toc
 -
--optflags: parisc -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}}
--optflags: hppa1.0 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}}
--optflags: hppa1.1 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_1: %{specflags_hppa1_1}}}
--optflags: hppa1.2 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_2: %{specflags_hppa1_2}}}
--optflags: hppa2.0 -O2 -fno-strict-aliasing -fwrapv -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa2_0: %{specflags_hppa2_0}}}
+-optflags: parisc -O2 -g -mpa-risc-1-0
+-optflags: hppa1.0 -O2 -g -mpa-risc-1-0
+-optflags: hppa1.1 -O2 -g -mpa-risc-1-0
+-optflags: hppa1.2 -O2 -g -mpa-risc-1-0
+-optflags: hppa2.0 -O2 -g -mpa-risc-1-0
 -
--optflags: mips -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}}
--optflags: mipsel -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}%{?specflags_mipsel: %{specflags_mipsel}}}
+-optflags: mips -O2 -g
+-optflags: mipsel -O2 -g
 -
--optflags: armv3l -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv3l: %{specflags_armv3l}}}
--optflags: armv4b -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4b: %{specflags_armv4b}}}
--optflags: armv4l -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4l: %{specflags_armv4l}}}
--optflags: armv5teb -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv5te%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv5teb: %{specflags_armv5teb}}}
--optflags: armv5tel -O2 -fno-strict-aliasing -fwrapv -fsigned-char -fomit-frame-pointer -march=armv5te%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv5tel: %{specflags_armv5tel}}}
+-optflags: armv3l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv3
+-optflags: armv4b -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4
+-optflags: armv4l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4
+-optflags: armv5teb -O2 -g -fsigned-char -fomit-frame-pointer -march=armv5te
+-optflags: armv5tel -O2 -g -fsigned-char -fomit-frame-pointer -march=armv5te
 -
--optflags: atarist -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atarist: %{specflags_atarist}}}
--optflags: atariste -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariste: %{specflags_atariste}}}
--optflags: ataritt -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ataritt: %{specflags_ataritt}}}
--optflags: falcon -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_falcon: %{specflags_falcon}}}
--optflags: atariclone -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}}
--optflags: milan -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}}
--optflags: hades -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}}
+-optflags: atarist -O2 -g -fomit-frame-pointer
+-optflags: atariste -O2 -g -fomit-frame-pointer
+-optflags: ataritt -O2 -g -fomit-frame-pointer
+-optflags: falcon -O2 -g -fomit-frame-pointer
+-optflags: atariclone -O2 -g -fomit-frame-pointer
+-optflags: milan -O2 -g -fomit-frame-pointer
+-optflags: hades -O2 -g -fomit-frame-pointer
 +optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
 +optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
 +optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
@@ -118,14 +120,14 @@
 +optflags: milan -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}}
 +optflags: hades -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}}
  
--optflags: s390 -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
--optflags: s390x -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
+-optflags: s390 -O2 -g -m31
+-optflags: s390x -O2 -g -m64
 +optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
 +optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
  
  #############################################################
  # Canonical arch names and numbers
-@@ -126,8 +124,6 @@
+@@ -128,8 +124,6 @@
  arch_canon:   armv3l: armv3l  12
  arch_canon:     armv4b:       armv4b  12
  arch_canon:     armv4l:       armv4l  12
@@ -134,18 +136,16 @@
  
  arch_canon:   m68kmint: m68kmint      13
  arch_canon:   atarist: m68kmint       13
-@@ -205,8 +205,8 @@
+@@ -205,7 +205,7 @@
  buildarchtranslate: sun4m: sparc
  buildarchtranslate: sparcv8: sparc
  buildarchtranslate: sparcv9: sparcv9
 -buildarchtranslate: sun4u: sparc64
--buildarchtranslate: sparc64: sparc64
 +buildarchtranslate: sun4u: sparc
-+buildarchtranslate: sparc64: sparc
+ buildarchtranslate: sparc64: sparc64
  
  buildarchtranslate: osfmach3_ppc: ppc
- buildarchtranslate: powerpc: ppc
-@@ -236,9 +232,9 @@
+@@ -238,9 +232,9 @@
  
  buildarchtranslate: ia64: ia64
  
@@ -158,7 +158,7 @@
  
  #############################################################
  # Architecture compatibility
-@@ -295,8 +291,6 @@
+@@ -297,8 +291,6 @@
  arch_compat: hppa1.0: parisc
  arch_compat: parisc: noarch
  
@@ -167,7 +167,7 @@
  arch_compat: armv4b: noarch
  arch_compat: armv4l: armv3l
  arch_compat: armv3l: noarch
-@@ -391,8 +385,6 @@
+@@ -393,8 +385,6 @@
  buildarch_compat: armv3l: noarch
  buildarch_compat: armv4b: noarch
  buildarch_compat: armv4l: noarch
@@ -176,3 +176,12 @@
  
  buildarch_compat: hppa2.0: hppa1.2
  buildarch_compat: hppa1.2: hppa1.1
+@@ -419,7 +409,7 @@
+ buildarch_compat: amd64: x86_64
+ buildarch_compat: ia32e: x86_64
+ 
+-macrofiles:   @USRLIBRPM@/macros:@USRLIBRPM@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros
++macrofiles:   @USRLIBRPM@/macros:@USRLIBRPM@/macros.build:@USRLIBRPM@/%{_target}/macros:@SYSCONFIGDIR@/macros.*:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros
+ 
+ # \endverbatim
+ #*/

diff --git a/rpm.spec b/rpm.spec
index 35018993f239453fa4883d503097b57e2534903d..36e77e9fcecc5d496eef75c07958c79e02cd581b 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -557,7 +557,7 @@ Requires:   gcc >= 3.0.3
 Requires:      gcc
 %endif
 %else
-# rpmrc patch adds flags specific to gcc >= 3.4
+# rpmrc patch adds flags specific to gcc >= 4.7
 Requires:      gcc >= 6:4.7.0
 %endif
 Requires:      glibc-devel
@@ -717,7 +717,11 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1000 -p1
 #%patch0 -p1
 %patch2 -p1
+%if "%{pld_release}" == "ac"
+%patch1070 -p1
+%else
 %patch1 -p1
+%endif
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
@@ -845,7 +849,6 @@ rm -rf db3 db rpmdb/db.h
 
 %if "%{pld_release}" == "ac"
 %patch1067 -p1
-%patch1070 -p1
 %endif
 
 # generate Group translations to *.po