packages: gcc/gcc.spec - use major_ver and gcj_soname_ver instead of hardco...

[pluto]

Author: pluto                        Date: Fri Apr 16 10:59:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use major_ver and gcj_soname_ver instead of hardcoded numbers.

---- Files affected:
packages/gcc:
   gcc.spec (1.607 -> 1.608) 

---- Diffs:

================================================================
Index: packages/gcc/gcc.spec
diff -u packages/gcc/gcc.spec:1.607 packages/gcc/gcc.spec:1.608
--- packages/gcc/gcc.spec:1.607	Fri Apr 16 12:27:25 2010
+++ packages/gcc/gcc.spec	Fri Apr 16 12:59:41 2010
@@ -64,6 +64,7 @@
 %define		major_ecj_ver	4.5
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
+%define		gcj_soname_ver	11
 
 Summary:	GNU Compiler Collection: the C compiler and shared files
 Summary(es.UTF-8):	Colección de compiladores GNU: el compilador C y ficheros compartidos
@@ -1583,20 +1584,20 @@
 mv -f	$RPM_BUILD_ROOT%{_libdir}/gcc/*/*/adalib/*.so.1 \
 	$RPM_BUILD_ROOT%{_libdir}
 # check if symlink to be made is valid
-test -f	$RPM_BUILD_ROOT%{_libdir}/libgnat-4.5.so.1
-ln -sf	libgnat-4.5.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-4.5.so
-ln -sf	libgnarl-4.5.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-4.5.so
-ln -sf	libgnat-4.5.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
-ln -sf	libgnarl-4.5.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
+test -f	$RPM_BUILD_ROOT%{_libdir}/libgnat-%{major_ver}.so.1
+ln -sf	libgnat-%{major_ver}.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnat-%{major_ver}.so
+ln -sf	libgnarl-%{major_ver}.so.1 $RPM_BUILD_ROOT%{_libdir}/libgnarl-%{major_ver}.so
+ln -sf	libgnat-%{major_ver}.so $RPM_BUILD_ROOT%{_libdir}/libgnat.so
+ln -sf	libgnarl-%{major_ver}.so $RPM_BUILD_ROOT%{_libdir}/libgnarl.so
 %if %{with multilib}
 mv -f	$RPM_BUILD_ROOT%{_libdir}/gcc/*/*/32/adalib/*.so.1 \
 	$RPM_BUILD_ROOT%{_libdir32}
 # check if symlink to be made is valid
-test -f	$RPM_BUILD_ROOT%{_libdir32}/libgnat-4.5.so.1
-ln -sf	libgnat-4.5.so.1 $RPM_BUILD_ROOT%{_libdir32}/libgnat-4.5.so
-ln -sf	libgnarl-4.5.so.1 $RPM_BUILD_ROOT%{_libdir32}/libgnarl-4.5.so
-ln -sf	libgnat-4.5.so $RPM_BUILD_ROOT%{_libdir32}/libgnat.so
-ln -sf	libgnarl-4.5.so $RPM_BUILD_ROOT%{_libdir32}/libgnarl.so
+test -f	$RPM_BUILD_ROOT%{_libdir32}/libgnat-%{major_ver}.so.1
+ln -sf	libgnat-%{major_ver}.so.1 $RPM_BUILD_ROOT%{_libdir32}/libgnat-%{major_ver}.so
+ln -sf	libgnarl-%{major_ver}.so.1 $RPM_BUILD_ROOT%{_libdir32}/libgnarl-%{major_ver}.so
+ln -sf	libgnat-%{major_ver}.so $RPM_BUILD_ROOT%{_libdir32}/libgnat.so
+ln -sf	libgnarl-%{major_ver}.so $RPM_BUILD_ROOT%{_libdir32}/libgnarl.so
 %endif
 %endif
 
@@ -1614,8 +1615,7 @@
 cp -f libobjc/README gcc/objc/README.libobjc
 %endif
 
-# gcj-$version-$gcjsonamever
-%define	gcjdbexecdir	gcj-%{version}-11
+%define	gcjdbexecdir	gcj-%{version}-%{gcj_soname_ver}
 
 # avoid -L poisoning in *.la - there should be only -L%{_libdir}/gcc/*/%{version}
 # normalize libdir, to avoid propagation of unnecessary RPATHs by libtool
@@ -2146,16 +2146,16 @@
 %doc libjava/{ChangeLog,LIBGCJ_LICENSE,NEWS,README,THANKS}
 %attr(755,root,root) %{_bindir}/gij
 %attr(755,root,root) %{_libdir}/libgcj-tools.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcj-tools.so.11
+%attr(755,root,root) %ghost %{_libdir}/libgcj-tools.so.%{gcj_soname_ver}
 %attr(755,root,root) %{_libdir}/libgcj.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgcj.so.11
+%attr(755,root,root) %ghost %{_libdir}/libgcj.so.%{gcj_soname_ver}
 %attr(755,root,root) %{_libdir}/libgcj_bc.so
 %attr(755,root,root) %{_libdir}/libgcj_bc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgcj_bc.so.1
 %attr(755,root,root) %{_libdir}/libgij.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgij.so.11
+%attr(755,root,root) %ghost %{_libdir}/libgij.so.%{gcj_soname_ver}
 %{?with_x:%attr(755,root,root) %{_libdir}/lib-gnu-awt-xlib.so.*.*.*}
-%{?with_x:%attr(755,root,root) %ghost %{_libdir}/lib-gnu-awt-xlib.so.11}
+%{?with_x:%attr(755,root,root) %ghost %{_libdir}/lib-gnu-awt-xlib.so.%{gcj_soname_ver}}
 %dir %{_libdir}/%{gcjdbexecdir}
 %{_libdir}/%{gcjdbexecdir}/classmap.db
 %{?with_mozilla:%attr(755,root,root) %{_libdir}/%{gcjdbexecdir}/libgcjwebplugin.so}
@@ -2307,6 +2307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.608  2010/04/16 10:59:41  pluto
+- use major_ver and gcj_soname_ver instead of hardcoded numbers.
+
 Revision 1.607  2010/04/16 10:27:25  arekm
 - more todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcc/gcc.spec?r1=1.607&r2=1.608&f=u