reflect previous commit for setting gcc_dir_version to other spec files

[platform/upstream/gcc48.git] / packaging / gcc48-testresults.spec

diff --git a/packaging/gcc48-testresults.spec b/packaging/gcc48-testresults.spec
index e3d04cc..2ea442c 100644 (file)
--- a/packaging/gcc48-testresults.spec
+++ b/packaging/gcc48-testresults.spec
@@ -58,24 +58,20 @@
 %endif
 
 # Shared library SONAME versions
-%ifarch hppa
-%define libgcc_s 4
-%else
 %define libgcc_s 1
-%endif
-%define libgcj_sover 14
-%define libgcj_bc_sover 1
-%define libffi_sover 4
-%define libmudflap_sover 0
-%define libgomp_sover 1
-%define libstdcxx_sover 6
-%define libobjc_sover 4
-%define libgfortran_sover 3
-%define libquadmath_sover 0
-%define libasan_sover 0
-%define libtsan_sover 0
-%define libatomic_sover 1
-%define libitm_sover 1
+%define libgcj_sover %{nil}
+%define libgcj_bc_sover %{nil}
+%define libffi_sover %{nil}
+%define libmudflap_sover %{nil}
+%define libgomp_sover %{nil}
+%define libstdcxx_sover %{nil}
+%define libobjc_sover %{nil}
+%define libgfortran_sover %{nil}
+%define libquadmath_sover %{nil}
+%define libasan_sover %{nil}
+%define libtsan_sover %{nil}
+%define libatomic_sover %{nil}
+%define libitm_sover %{nil}
 
 # Shared library package suffix
 # This is used for the "non-standard" set of libraries, the standard
@@ -180,9 +176,7 @@ BuildRequires: gdb
 URL:          http://gcc.gnu.org/
 Version: 4.8.1
 Release:      1
-%define gcc_version %(echo %version | sed 's/_.*//')
-%define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
-%define snapshot_date %(echo %version | sed 's/[34]\.[0-9]\.[0-6]//' | sed 's/_/-/')
+%define gcc_dir_version 4.8
 %define binsuffix -4.8
 
 %if !0%{?building_libjava:1}%{?building_libffi:1}%{?building_testsuite:1}
@@ -210,7 +204,7 @@ Suggests: gcc48-info gcc48-locale
 %endif
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
-Source:                gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source:                gcc-%{version}.tar.bz2
 Source1:       change_spec
 Source3:       gcc48-rpmlintrc
 Source4:       ecj.jar
@@ -219,7 +213,6 @@ Source6:    baselibs.conf
 
 Summary:      Testsuite results
 License:       SUSE-Public-Domain
-Group:        Development/Languages/C and C++
 
 %description 
 Results from running the gcc and target library testsuites.
@@ -336,7 +329,7 @@ Results from running the gcc and target library testsuites.
 
 
 %prep
-%setup -q -n gcc-%{gcc_version}%{snapshot_date}
+%setup -q -n gcc-%{version}
 
 
 # We are configuring ppc as ppc64 but with switched multilibs.  Adjust
@@ -548,10 +541,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_OPT_FLAGS $GCJ_EXTRA_FLAGS" \
 %endif
 %if "%{TARGET_ARCH}" == "armv7l" 
        --with-arch=armv7-a \
-       --with-tune=cortex-a9 \
-       --with-float=hard \
-       --with-abi=aapcs-linux \
-       --with-fpu=vfpv3-d16 \
+       --with-tune=cortex-a8 \
+       --with-float=softfp \
+       --with-fpu=vfpv3 \
        --disable-sjlj-exceptions \
 %endif
 %if  "%{TARGET_ARCH}" == "armv7hl"