- keep arch specific macros here

Changed files:
    rpm-macros-amd64 -> 1.1
    rpm-macros-athlon -> 1.1
    rpm-macros-i386 -> 1.1
    rpm-macros-i486 -> 1.1
    rpm-macros-i586 -> 1.1
    rpm-macros-i686 -> 1.1
    rpm-macros-ia32e -> 1.1
    rpm-macros-noarch -> 1.1
    rpm-macros-pentium3 -> 1.1
    rpm-macros-pentium4 -> 1.1
    rpm-macros-ppc -> 1.1
    rpm-macros-x86_64 -> 1.1

diff --git a/rpm-macros-amd64 b/rpm-macros-amd64
new file mode 100644 (file)
index 0000000..6b1313d
--- /dev/null
+++ b/rpm-macros-amd64
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..f65b8cf
--- /dev/null
+++ b/rpm-macros-athlon
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..006045a
--- /dev/null
+++ b/rpm-macros-i386
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..b13f9f5
--- /dev/null
+++ b/rpm-macros-i486
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..cb976ee
--- /dev/null
+++ b/rpm-macros-i586
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..92a8a98
--- /dev/null
+++ b/rpm-macros-i686
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..61f20f4
--- /dev/null
+++ b/rpm-macros-ia32e
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..0efe99a
--- /dev/null
+++ b/rpm-macros-noarch
@@ -0,0 +1,34 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..01a9fbf
--- /dev/null
+++ b/rpm-macros-pentium3
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..869e5ae
--- /dev/null
+++ b/rpm-macros-pentium4
@@ -0,0 +1,37 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..a9a3c50
--- /dev/null
+++ b/rpm-macros-ppc
@@ -0,0 +1,36 @@
+# 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            %{_sysconfdir}/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
new file mode 100644 (file)
index 0000000..10bfc31
--- /dev/null
+++ b/rpm-macros-x86_64
@@ -0,0 +1,37 @@
+# Per-platform rpm configuration file.
+
+#==============================================================================
+# ---- per-platform macros.
+#
+%_arch                 amd64
+%_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            %{_sysconfdir}/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.]*)$
+