- gcc visibility issue fixed and reenabled.

Changed files:
    rpm.macros -> 1.215
    rpm.spec -> 1.664

diff --git a/rpm.macros b/rpm.macros
index 9bce376a779feb80603d005c446189393ec4f546..a304bf46b9ceb8b9e2dacd5df68a074c907eefde 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -20,9 +20,7 @@
 
 %debugcflags   -O0 -g -Wall
 %rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
-%rpmcxxflags   %{rpmcflags}
-# -fvisibility-inlines-hidden disabled. see gcc/PR(19664,20218) for details.
-# %rpmcxxflags %{rpmcflags} -fvisibility-inlines-hidden
+%rpmcxxflags   %{rpmcflags} -fvisibility-inlines-hidden
 %rpmldflags    %{nil}
 # %rpmldflags  -Wl,--as-needed
 

diff --git a/rpm.spec b/rpm.spec
index 9cf8936deb4610f9123e9c0ee8347485191793b7..3a717e6dee8b546ab0a577b9768c50970767d55e 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -30,7 +30,7 @@ Summary(uk):  
 Name:          rpm
 %define        sover   4.4
 Version:       4.4.1
-Release:       1.9
+Release:       1.10
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -397,16 +397,8 @@ Requires:  elfutils
 Requires:      file >= 4.13-2
 Requires:      fileutils
 Requires:      findutils
-%ifarch athlon
-Requires:      gcc >= 3.0.3
-%else
-%ifarch i686
-# because of -mtune in rpmrc
-Requires:      gcc >= 5:3.4
-%else
-Requires:      gcc
-%endif
-%endif
+# because of -fvisibility... related fixes
+Requires:      gcc >= 5:4.0.1-0.20050514.2
 Requires:      glibc-devel
 Requires:      grep
 Requires:      gzip
@@ -419,8 +411,6 @@ Requires:   tar
 Requires:      textutils
 Provides:      rpmbuild(macros) = %{rpm_macros_rev}
 Provides:      rpmbuild(noauto) = 3
-# because of -fvisibility-inlines-hidden in rpm.macros
-Conflicts:     gcc-c++ < 5:3.4
 %ifarch %{x8664}
 Conflicts:     automake < 1:1.7.9-2
 Conflicts:     libtool < 2:1.5-13