rpms/java-1.5.0-gcj/devel java-1.5.0-gcj.spec,1.7,1.8

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/extras/rpms/java-1.5.0-gcj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10741

Modified Files:
	java-1.5.0-gcj.spec 
Log Message:
* Mon Mar 19 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4.1
- Temporary build to get Extras Java packages building again.




Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.5.0-gcj.spec	17 Mar 2007 03:49:25 -0000	1.7
+++ java-1.5.0-gcj.spec	19 Mar 2007 21:47:55 -0000	1.8
@@ -39,23 +39,13 @@
 
 # standard JPackage directories and symbolic links
 # make 64-bit JDKs just another alternative on 64-bit architectures
-%ifarch ppc64 s390x x86_64
-%define sdklnk          java-%{javaver}-%{origin}.%{_arch}
-%define jrelnk          jre-%{javaver}-%{origin}.%{_arch}
-%define sdkdir          %{name}-%{version}.%{_arch}
-%else
 %define sdklnk          java-%{javaver}-%{origin}
 %define jrelnk          jre-%{javaver}-%{origin}
 %define sdkdir          %{name}-%{version}
-%endif
 %define jredir          %{sdkdir}/jre
 %define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
 %define jrebindir       %{_jvmdir}/%{jrelnk}/bin
-%ifarch ppc64 s390x x86_64
-%define jvmjardir       %{_jvmjardir}/%{name}-%{version}.%{_arch}
-%else
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
-%endif
 
 %if %{enable_plugin}
 %define plugindir       %{_libdir}/mozilla/plugins
@@ -65,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 
@@ -87,9 +77,12 @@
 Requires:         libgcj%{gccsuffix} >= %{gccver}
 # required for directory structures
 Requires:         jpackage-utils >= 1.7.3
+# required for java.security symlink.  also ensures that the proper
+# libgcj is installed on multilib systems.
+Requires:         %{syslibdir}/security/classpath.security
 %if ! %{bootstrap}
 # required for javadoc symlink
-Requires: sinjdoc
+Requires:         sinjdoc
 %endif
 # post requires alternatives to install tool alternatives
 Requires(post):   %{_sbindir}/alternatives
@@ -260,9 +253,6 @@
 %build
 %configure --disable-symlinks --with-arch-directory=%{_arch} \
   --with-os-directory=linux \
-%ifarch ppc64 s390x x86_64
-  --with-arch-suffix=.%{_arch} \
-%endif
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
 
@@ -297,8 +287,9 @@
 # security directory and provider list
 install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
 pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-  RELATIVE=$(%{abs2rel} %{syslibdir} %{_jvmdir}/%{jredir}/lib/security)
-  ln -sf $RELATIVE/security/classpath.security java.security
+  RELATIVE=$(%{abs2rel} %{syslibdir}/security \
+    %{_jvmdir}/%{jredir}/lib/security)
+  ln -sf $RELATIVE/classpath.security java.security
 popd
 # FIXME: add security.d support to libgcj, get rid of these and
 # rebuild-security-providers
@@ -730,22 +721,25 @@
 %endif
 
 %changelog
-* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4.fc7
+* Mon Mar 19 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4.1
+- Temporary build to get Extras Java packages building again.
+
+* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4
 - Remove config(noreplace) markings on security.d files.
 - Make java-1.4.2-gcj-compat* provides strictly-greater-than
   1.4.2.0-40jpp.111.
 - Remove gjdoc build requirement.
 - Import java-gcj-compat 1.0.72.
 
-* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-3.fc7
+* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-3
 - Require sinjdoc.
 
-* Thu Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-2.fc7
+* Thu Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-2
 - Set bootstrap to 0 to build javadoc sub-package, now that sinjdoc
   has been built.
 - Add temporary gjdoc build requirement.
 
-* Thu Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-1.fc7
+* Thu Mar 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-1
 - Set bootstrap to 1 since sinjdoc is not yet available to build
   javadocs.
 - Import java-gcj-compat 1.0.70.