|
|
@@ -155,6 +155,7 @@ Group: System Environment/Libraries
|
|
|
# in 2.1 and 2.1.5 (2.9.0, 2.10.0)
|
|
|
##VINE##Obsoletes: libstdc++
|
|
|
##VINE##Provides: libstdc++
|
|
|
+Obsoletes: compat32-libstdc++3 < %{version}-%{release}
|
|
|
|
|
|
|
|
|
%description -n libstdc++3
|
|
|
@@ -175,7 +176,6 @@ Summary(ja): GNU コンパイラ集 - C++ ライブラリ
|
|
|
Group: System Environment/Libraries
|
|
|
Requires: libstdc++3 = %{version}-%{release}
|
|
|
|
|
|
-
|
|
|
%description -n compat32-libstdc++3
|
|
|
The libstdc++3 package contains a rewritten standard compliant GCC Standard
|
|
|
C++ Library.
|
|
|
@@ -1062,9 +1062,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%postun -n libstdc++3 -p /sbin/ldconfig
|
|
|
|
|
|
-%post -n compat32-libstdc++3 -p /sbin/ldconfig
|
|
|
+#VINE#post -n compat32-libstdc++3 -p /sbin/ldconfig
|
|
|
|
|
|
-%postun -n compat32-libstdc++3 -p /sbin/ldconfig
|
|
|
+#VINE#postun -n compat32-libstdc++3 -p /sbin/ldconfig
|
|
|
|
|
|
%post -n libobjc3 -p /sbin/ldconfig
|
|
|
|
|
|
@@ -1409,17 +1409,17 @@ fi
|
|
|
|
|
|
%files -n libstdc++3
|
|
|
%defattr(-,root,root)
|
|
|
-#%ifarch x86_64
|
|
|
-#%{_prefix}/lib/libstdc++.so.5*
|
|
|
-#%endif
|
|
|
+%ifarch x86_64
|
|
|
+%{_prefix}/lib/libstdc++.so.5*
|
|
|
+%endif
|
|
|
%{_prefix}/%{_lib}/libstdc++.so.5*
|
|
|
%doc libstdc++-v3/*ChangeLog*
|
|
|
|
|
|
|
|
|
%if %{build_compat32}
|
|
|
%files -n compat32-libstdc++3
|
|
|
-%defattr(-,root,root)
|
|
|
-%{_prefix}/lib/libstdc++.so.5*
|
|
|
+#defattr(-,root,root)
|
|
|
+#{_prefix}/lib/libstdc++.so.5*
|
|
|
%endif
|
|
|
|
|
|
|
|
|
@@ -1560,6 +1560,9 @@ fi
|
|
|
#%{_mandir}/man1/gij.1*
|
|
|
#%{_mandir}/man1/rmic.1*
|
|
|
#%{_mandir}/man1/rmiregistry.1*
|
|
|
+%ifarch x86_64
|
|
|
+%{_prefix}/lib/libgcj.so.4
|
|
|
+%endif
|
|
|
%{_prefix}/%{_lib}/libgcj.so.*
|
|
|
%{_prefix}/%{_lib}/lib-org-w3c-dom.so.*
|
|
|
%{_prefix}/%{_lib}/lib-org-xml-sax.so.*
|
|
|
@@ -1652,6 +1655,7 @@ fi
|
|
|
%changelog
|
|
|
* Sun Sep 26 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.6-6
|
|
|
- added libobjc3 subpackage
|
|
|
+- dropt compat32-libstdc++3 package (merged to libstdc++3 package)
|
|
|
|
|
|
* Mon Sep 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.6-5
|
|
|
- fixed /usr/lib/security path for x86_64
|
inagaki