|
@@ -1,7 +1,7 @@
|
|
|
%define DATE 20050503
|
|
|
|
|
|
%define VERSION 3.3.6
|
|
|
-%define RELEASE 4%{?_dist_release}
|
|
|
+%define RELEASE 5%{?_dist_release}
|
|
|
|
|
|
%define gcc_version %{VERSION}
|
|
|
%define gcc_release %{RELEASE}
|
|
@@ -956,9 +956,12 @@ pushd $RPM_BUILD_ROOT%{_bindir}
|
|
|
fi
|
|
|
done
|
|
|
popd
|
|
|
-pushd $RPM_BUILD_ROOT%{_prefix}/%{_lib}/security
|
|
|
+%ifnarch x86_64
|
|
|
+pushd $RPM_BUILD_ROOT%{_libdir}/security
|
|
|
mv classpath.security classpath.security-%{version}
|
|
|
popd
|
|
|
+%endif
|
|
|
+
|
|
|
|
|
|
cd ..
|
|
|
##VINE##%find_lang gcc
|
|
@@ -1071,6 +1074,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%post -n libgcj3
|
|
|
/sbin/ldconfig
|
|
|
+%ifnarch x86_64
|
|
|
/sbin/update-alternatives \
|
|
|
--install %{_bindir}/gij gij %{_bindir}/gij-%{version} 21 \
|
|
|
--slave %{_bindir}/jv-convert jv-convert \
|
|
@@ -1078,7 +1082,16 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
--slave %{_bindir}/rmic rmic %{_bindir}/rmic-%{version} \
|
|
|
--slave %{_bindir}/rmiregistry rmiregistry \
|
|
|
%{_bindir}/rmiregistry-%{version} \
|
|
|
- --slave %{_prefix}/%{_lib}/security/classpath.security classpath.security %{_prefix}/%{_lib}/security/classpath.security-%{version}
|
|
|
+ --slave %{_libdir}/security/classpath.security classpath.security %{_libdir}/security/classpath.security-%{version}
|
|
|
+%else
|
|
|
+/sbin/update-alternatives \
|
|
|
+ --install %{_bindir}/gij gij %{_bindir}/gij-%{version} 21 \
|
|
|
+ --slave %{_bindir}/jv-convert jv-convert \
|
|
|
+ %{_bindir}/jv-convert-%{version} \
|
|
|
+ --slave %{_bindir}/rmic rmic %{_bindir}/rmic-%{version} \
|
|
|
+ --slave %{_bindir}/rmiregistry rmiregistry \
|
|
|
+ %{_bindir}/rmiregistry-%{version}
|
|
|
+%endif
|
|
|
|
|
|
# fix broken symlink if it's there
|
|
|
if [ ! -f %{_bindir}/gij ] ; then
|
|
@@ -1553,7 +1566,11 @@ fi
|
|
|
%{_prefix}/%{_lib}/lib-org-w3c-dom.so.*
|
|
|
%{_prefix}/%{_lib}/lib-org-xml-sax.so.*
|
|
|
%{_prefix}/share/java
|
|
|
-%{_prefix}/%{_lib}/security/classpath.security-%{version}
|
|
|
+%ifarch x86_64
|
|
|
+%{_prefix}/lib/security
|
|
|
+%else
|
|
|
+%{_libdir}/security
|
|
|
+%endif
|
|
|
|
|
|
|
|
|
%files -n libgcj3-devel
|
|
@@ -1635,6 +1652,9 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Sep 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.6-5
|
|
|
+- fixed /usr/lib/security path for x86_64
|
|
|
+
|
|
|
* Thu Jul 29 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.6-4
|
|
|
- rebuilt with current toolchain
|
|
|
- added R: fastjar to libgcj3 package
|