Update.

8 files changed, 22 insertions, 49 deletions

diff --git a/contrib/crossrpms/solaris2.7/binutils.am b/contrib/crossrpms/solaris2.7/binutils.am
index 60b6a2656a..4fcdb65945 100644
--- a/contrib/crossrpms/solaris2.7/binutils.am
+++ b/contrib/crossrpms/solaris2.7/binutils.am
@@ -22,9 +22,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti
 	  | $(MKSPEC0) > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
-@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
+$(rpmprefix)$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in
 	$(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec
-noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec
+CLEANFILES += $(rpmprefix)$(TARGET)-binutils.spec
+noinst_DATA += $(rpmprefix)$(TARGET)-binutils.spec
 
 EXTRA_DIST += $(BINUTILS_SUBPACKAGES)
diff --git a/contrib/crossrpms/solaris2.7/gcc.am b/contrib/crossrpms/solaris2.7/gcc.am
index 5deef27303..466d72ead3 100644
--- a/contrib/crossrpms/solaris2.7/gcc.am
+++ b/contrib/crossrpms/solaris2.7/gcc.am
@@ -17,12 +17,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
 GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
 
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
-	cat $(GCC_SUBPACKAGES) | sed \
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+	cat $(GCC_SUBPACKAGES) \
+	  | sed \
 	  -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
 	  -e "/[@]PREP[@]/d" \
+	  | sed \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
@@ -32,9 +34,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
 	  | $(MKSPEC0) > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
 
-$(rpmprefix)$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
 	$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += $(rpmprefix)$(TARGET)-gcc.spec
-noinst_DATA += $(rpmprefix)$(TARGET)-gcc.spec
+CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
+noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
 
 EXTRA_DIST += $(GCC_SUBPACKAGES)
diff --git a/contrib/crossrpms/solaris2.7/libs.am b/contrib/crossrpms/solaris2.7/libs.am
index c02c0499d1..b0fc492a15 100644
--- a/contrib/crossrpms/solaris2.7/libs.am
+++ b/contrib/crossrpms/solaris2.7/libs.am
@@ -12,7 +12,7 @@ $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
 	                      
-@rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
+$(rpmprefix)$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
 	$(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
-noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
+CLEANFILES += $(rpmprefix)$(TARGET)-libs.spec
+noinst_DATA += $(rpmprefix)$(TARGET)-libs.spec
diff --git a/contrib/crossrpms/solaris2.7/sparc/Makefile.am b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
index 1dd1cfe23c..9dcb184eb2 100644
--- a/contrib/crossrpms/solaris2.7/sparc/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/sparc/Makefile.am
@@ -5,19 +5,19 @@ TARGET = sparc-sun-solaris2.7
 include $(top_srcdir)/mkspec.am
 
 SOLARIS_VERS = 2.7
-SOLARIS_RPMREL = 0.20091006.1
+SOLARIS_RPMREL = 0.20091130.1
 EXTRA_DIST += libs.add
 EXTRA_DIST += target-libs.add
 include ../libs.am
 
 BINUTILS_VERS = 2.20
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 0.20091020.2
+BINUTILS_RPMREL = 0.20091130.1
 include ../binutils.am
 BINUTILS_OPTS +=
 
 GCC_VERS = 4.4.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 0.20091020.1
+GCC_RPMREL = 0.20091130.1
 include ../gcc.am
 GCC_OPTS += --languages=c,cxx,fortran,objc
diff --git a/contrib/crossrpms/solaris2.7/sparc/libs.add b/contrib/crossrpms/solaris2.7/sparc/libs.add
index f0d20035b3..0bb212d791 100644
--- a/contrib/crossrpms/solaris2.7/sparc/libs.add
+++ b/contrib/crossrpms/solaris2.7/sparc/libs.add
@@ -5,7 +5,7 @@
 %define __debug_install_post %{nil}
 
 Name:         @rpmprefix@@tool_target@
-Release:      @SOLARIS_RPMREL@%{?dist}
+Release:      @SOLARIS_RPMREL@
 License:      Sun Microsystems
 Group:        Development/Tools
 
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
index 10195a5115..0c7bf2c644 100644
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
+++ b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-binutils.spec
@@ -38,7 +38,7 @@ Name:		sparc-sun-solaris2.7-binutils
 Summary:	Binutils for target sparc-sun-solaris2.7
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	0.20091020.2%{?dist}
+Release:	0.20091130.1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -164,14 +164,9 @@ GNU binutils targetting sparc-sun-solaris2.7.
 
 %files -n sparc-sun-solaris2.7-binutils
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_datarootdir}
 
-%dir %{_mandir}
-%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-sun-solaris2.7-*.1*
 
-%dir %{_bindir}
 %{_bindir}/sparc-sun-solaris2.7-*
 
 %dir %{_exec_prefix}/sparc-sun-solaris2.7
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
index 83bd6c60c0..0eaafe97c8 100644
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
+++ b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-gcc.spec
@@ -41,7 +41,7 @@ Summary:      	sparc-sun-solaris2.7 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	0.20091020.1%{?dist}
+Release:      	0.20091130.1%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -85,9 +85,10 @@ BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
 # FIXME: This is an ugly cludge
 %{?fc10:%global mpfr_provided 2.3.2}
 %{?fc11:%global mpfr_provided 2.4.1}
-%{?suse10_3:%global mpfr_provided 2.2.1}
+%{?fc12:%global mpfr_provided 2.4.1}
 %{?suse11_0:%global mpfr_provided 2.3.1}
 %{?suse11_1:%global mpfr_provided 2.3.2}
+%{?suse11_2:%global mpfr_provided 2.4.1}
 %{?cygwin:%global mpfr_provided 2.4.1}
 %{?mingw32:%global mpfr_provided %{nil}}
 
@@ -433,22 +434,17 @@ libgcc sparc-sun-solaris2.7-gcc.
 
 %files -n sparc-sun-solaris2.7-gcc
 %defattr(-,root,root)
-%dir %{_prefix}
 
-%dir %{_mandir}
-%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-sun-solaris2.7-gcc.1*
 %{_mandir}/man1/sparc-sun-solaris2.7-cpp.1*
 %{_mandir}/man1/sparc-sun-solaris2.7-gcov.1*
 
-%dir %{_bindir}
 %{_bindir}/sparc-sun-solaris2.7-cpp%{_exeext}
 %{_bindir}/sparc-sun-solaris2.7-gcc%{_exeext}
 %{_bindir}/sparc-sun-solaris2.7-gcc-%{gcc_version}%{_exeext}
 %{_bindir}/sparc-sun-solaris2.7-gcov%{_exeext}
 %{_bindir}/sparc-sun-solaris2.7-gccbug
 
-%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -458,8 +454,6 @@ libgcc sparc-sun-solaris2.7-gcc.
 
 %files -n sparc-sun-solaris2.7-gcc-libgcc -f build/files.gcc
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -510,17 +504,12 @@ License:	GPL
 
 %files -n sparc-sun-solaris2.7-gcc-c++
 %defattr(-,root,root)
-%dir %{_prefix}
 
-%dir %{_mandir}
-%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-sun-solaris2.7-g++.1*
 
-%dir %{_bindir}
 %{_bindir}/sparc-sun-solaris2.7-c++%{_exeext}
 %{_bindir}/sparc-sun-solaris2.7-g++%{_exeext}
 
-%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -529,8 +518,6 @@ License:	GPL
 
 %files -n sparc-sun-solaris2.7-gcc-libstdc++ -f build/files.g++
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -554,15 +541,10 @@ GCC fortran compiler for sparc-sun-solaris2.7.
 
 %files -n sparc-sun-solaris2.7-gcc-gfortran
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_bindir}
 %{_bindir}/sparc-sun-solaris2.7-gfortran%{_exeext}
 
-%dir %{_mandir}
-%dir %{_mandir}/man1
 %{_mandir}/man1/sparc-sun-solaris2.7-gfortran.1*
 
-%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -583,8 +565,6 @@ License:	GPL
 
 %files -n sparc-sun-solaris2.7-gcc-libgfortran -f build/files.gfortran
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -609,8 +589,6 @@ GCC objc compiler for sparc-sun-solaris2.7.
 
 %files -n sparc-sun-solaris2.7-gcc-objc
 %defattr(-,root,root)
-%dir %{_exec_prefix}
-%dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7
 %dir %{_libexecdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
@@ -631,8 +609,6 @@ Support libraries for GCC's objc compiler for sparc-sun-solaris2.7.
 
 %files -n sparc-sun-solaris2.7-gcc-libobjc -f build/files.objc
 %defattr(-,root,root)
-%dir %{_prefix}
-%dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7
 %dir %{_gcclibdir}/gcc/sparc-sun-solaris2.7/%{gcc_version}
diff --git a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
index a597bd5de7..14c2bed082 100644
--- a/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
+++ b/contrib/crossrpms/solaris2.7/sparc/sparc-sun-solaris2.7-libs.spec
@@ -37,7 +37,7 @@
 %define __debug_install_post %{nil}
 
 Name:         sparc-sun-solaris2.7
-Release:      0.20091006.1%{?dist}
+Release:      0.20091130.1%{?dist}
 License:      Sun Microsystems
 Group:        Development/Tools