Cleanup arch specific macros and {c,ld,*}flags

Cut down in content and packaged all arch specific macros as
cpu-os-macros.tar.gz package. Then copied cflags macro structure from
Mandriva macros and complementedted them with our compiler flags and
rpm macros.

diff --git a/macros.pld.in b/macros.pld.in
index ecdcb62fa5a9a7ec77e12f08c5cecd9495b94e8d..d7d46c8ca7fd50d220a1b806c79254201d8b710c 100644 (file)
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -14,7 +14,7 @@
 #
 %_vendor               pld
 %_os                   linux
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
 
 #==============================================================================
 # ---- configure macros.  note that most of these are inherited
@@ -103,28 +103,38 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 %undefine              __scriptlet_requires
 
-# provides don't obsolete
+# provides dont obsolete
 %_upgrade_tag          name
 
 #-----------------------------------------------------------------
 # CFLAGS and LDFLAGS used to build
 
-%debuginfocflags       %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
+%debuginfocflags       %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
 # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
 
-%debugcflags   -O0 -g -Wall
-%debugcppflags %{nil}
-%debugldflags  %{nil}
+%debugcflags   -O0 -g -Wall
+%debugcppflags %{nil}
+%debugldflags  %{nil}
 
-%optldflags    -Wl,--as-needed -Wl,-z,relro -Wl,-z,-combreloc
-%optcppflags   -D_FORTIFY_SOURCE=2
+%optldflags    -Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc
+%optcppflags   %{nil}
 
 # Warning: those macros are overwritten by macros.build,
 #          left here for compatibility
-%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-%rpmcxxflags   %{rpmcflags}
-%rpmldflags    %{!?no_build_with_as_needed:-Wl,--as-needed}
-%rpmcppflags   -D_FORTIFY_SOURCE=2
+%rpmcflags     %{nil}
+%rpmcxxflags   %{nil}
+%rpmldflags    %{nil}
+%rpmcppflags   %{nil}
+
+# common compilation flags
+%_fortify_cflags       -Wp,-D_FORTIFY_SOURCE=2
+
+# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
+%Werror_cflags         -Wformat -Werror=format-security
+
+%_ssp_cflags           -fstack-protector --param=ssp-buffer-size=4
+%__common_cflags       -O2 -fwrapv %{debuginfocflags} -pipe %{Werror_cflags} %{?_fortify_cflags}
+%__common_cflags_with_ssp      %{__common_cflags} %{?_ssp_cflags} %{!?nospecflags:%{?specflags}}}
 
 # arch macros
 %ix86  i386 i486 i586 i686 pentium3 pentium4 athlon

diff --git a/rpm-macros-amd64 b/rpm-macros-amd64
deleted file mode 100644 (file)
index 3e2f6e7..0000000
--- a/rpm-macros-amd64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 x86_64
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=x86-64%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib64
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib64
-%_libdir               /usr/lib64
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           2
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-athlon b/rpm-macros-athlon
deleted file mode 100644 (file)
index 51c54c7..0000000
--- a/rpm-macros-athlon
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-i386 b/rpm-macros-i386
deleted file mode 100644 (file)
index 756317f..0000000
--- a/rpm-macros-i386
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i386
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-i486 b/rpm-macros-i486
deleted file mode 100644 (file)
index b29cc5f..0000000
--- a/rpm-macros-i486
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i486
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-i586 b/rpm-macros-i586
deleted file mode 100644 (file)
index 5c4545f..0000000
--- a/rpm-macros-i586
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i586
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-i686 b/rpm-macros-i686
deleted file mode 100644 (file)
index ba6e326..0000000
--- a/rpm-macros-i686
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 i686
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-ia32e b/rpm-macros-ia32e
deleted file mode 100644 (file)
index 791e9a0..0000000
--- a/rpm-macros-ia32e
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 ia32e
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=x86-64%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32e: %{specflags_ia32e}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib64
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib64
-%_libdir               /usr/lib64
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           2
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-noarch b/rpm-macros-noarch
deleted file mode 100644 (file)
index fec2018..0000000
--- a/rpm-macros-noarch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 noarch
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib64
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib64
-%_libdir               /usr/lib64
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#      Multilibs
-%_multilibno           2
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$

diff --git a/rpm-macros-pentium3 b/rpm-macros-pentium3
deleted file mode 100644 (file)
index 87c181b..0000000
--- a/rpm-macros-pentium3
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 pentium3
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=pentium3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium3: %{specflags_pentium3}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-pentium4 b/rpm-macros-pentium4
deleted file mode 100644 (file)
index ca1fbfa..0000000
--- a/rpm-macros-pentium4
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 pentium4
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=pentium4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_pentium4: %{specflags_pentium4}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm-macros-ppc b/rpm-macros-ppc
deleted file mode 100644 (file)
index 7a45c57..0000000
--- a/rpm-macros-ppc
+++ /dev/null
@@ -1,36 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 ppc
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib
-%_libdir               /usr/%{_lib}
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           1
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$

diff --git a/rpm-macros-x86_64 b/rpm-macros-x86_64
deleted file mode 100644 (file)
index c2a8791..0000000
--- a/rpm-macros-x86_64
+++ /dev/null
@@ -1,37 +0,0 @@
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch                 x86_64
-%_vendor               pld
-%_os                   linux
-%_gnu                  -gnu
-%_target_platform      %{_target_cpu}-%{_vendor}-%{_target_os}
-%optflags              -O2 -fno-strict-aliasing -fwrapv -march=x86-64%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_prefix               /usr
-%_exec_prefix          /usr
-%_bindir               /usr/bin
-%_sbindir              /usr/sbin
-%_libexecdir           /usr/lib64
-%_datadir              /usr/share
-%_sysconfdir           /etc
-%_sharedstatedir       /var/lib
-%_localstatedir                /var
-%_lib                  lib64
-%_libdir               /usr/lib64
-%_includedir           /usr/include
-%_oldincludedir                /usr/include
-%_infodir              /usr/share/info
-%_mandir               /usr/share/man
-%_initrddir            /etc/rc.d/init.d
-
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           2
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-

diff --git a/rpm.spec b/rpm.spec
index fe4be2f59c9acf8dfd8c013480c3cae7b15a7de6..db366f915d9410b31e1ef6f0bf71eee8ee703dff 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -88,6 +88,8 @@ Group:                Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: 5d099161bdd3203265ab32ffad3360b5
+Source100:     cpu-os-macros.tar.gz
+# Source100-md5:       928034a5bdceb398881bc14b5f29973b
 Source1:       %{name}.groups
 Source2:       macros.pld.in
 Source3:       %{name}-install-tree
@@ -116,21 +118,6 @@ Source24:  rpm.noautoprovfiles
 Source25:      rpm.noautoreq
 Source26:      rpm.noautoreqdep
 Source27:      rpm.noautoreqfiles
-Source100:     %{name}-macros-athlon
-Source101:     %{name}-macros-i386
-Source102:     %{name}-macros-i486
-Source103:     %{name}-macros-i586
-Source104:     %{name}-macros-i686
-Source105:     %{name}-macros-noarch
-Source106:     %{name}-macros-pentium3
-Source107:     %{name}-macros-pentium4
-Source108:     %{name}-macros-ppc
-Source109:     %{name}-macros-x86_64
-Source110:     %{name}-macros-ia32e
-Source111:     %{name}-macros-amd64
-# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
-Source112:     cpu-os-macros.tar.gz
-# Source112-md5:       6fc7b779cd5476996fdc7872863e2106
 
 Patch0:                %{name}-branch.patch
 Patch1:                %{name}-man_pl.patch
@@ -683,7 +670,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 źrodeł RPM-a przez doxygen.
 
 %prep
-%setup -q -n %{name}-%{version}%{?subver}
+%setup -q -n %{name}-%{version}%{?subver} -a100
 #patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -806,29 +793,29 @@ install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
 
 # install ARCH macros
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux
-install %{SOURCE105} $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
+install cpu-os-macros/noarch-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/noarch-linux/macros
 
 %ifarch %{ix86}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{i386,i486,i586,i686,athlon,pentium3,pentium4}-linux
-install %{SOURCE100} $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
-install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
-install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
-install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
-install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
-install %{SOURCE106} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
-install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
+install cpu-os-macros/athlon-linux/macros   $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
+install cpu-os-macros/i386-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
+install cpu-os-macros/i486-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
+install cpu-os-macros/i586-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
+install cpu-os-macros/i686-linux/macros     $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
+install cpu-os-macros/pentium3-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
+install cpu-os-macros/pentium4-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
 %endif
 
 %ifarch %{x8664}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux
-install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
-install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
-install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
+install cpu-os-macros/x86_64-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
+install cpu-os-macros/ia32e-linux/macros  $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
+install cpu-os-macros/amd64-linux/macros  $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
 %endif
 
 %ifarch %{ppc}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux
-install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
+install cpu-os-macros/ppc-linux/macros $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
 %endif
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform