rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.64, 1.65

[fedora-cvs-commits at redhat.com]

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9193

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu May 26 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_28rh
- Re-remove bouncy castle provider.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- java-1.4.2-gcj-compat.spec	26 May 2005 05:03:20 -0000	1.64
+++ java-1.4.2-gcj-compat.spec	26 May 2005 14:02:10 -0000	1.65
@@ -13,7 +13,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_27rh
+%define release		40jpp_28rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	127
 
@@ -39,7 +39,7 @@
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
-BuildRequires:	eclipse-ecj
+#BuildRequires:	eclipse-ecj
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -108,16 +108,16 @@
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
 
-gzip -dc %{SOURCE1} | tar -xf -
-# build bouncy castle provider
-pushd bcprov-jdk14-%{bcarchivever}/src
-  find -type d -name test | xargs rm -rf
-  ecj `find . -type f -name "*.java"`
-  jar2="bcprov-%{bcarchivever}.jar"
-  files="`find . -type f -name "*.class"`"
-  test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
-popd
+# gzip -dc %{SOURCE1} | tar -xf -
+# # build bouncy castle provider
+# pushd bcprov-jdk14-%{bcarchivever}/src
+#   find -type d -name test | xargs rm -rf
+#   ecj `find . -type f -name "*.java"`
+#   jar2="bcprov-%{bcarchivever}.jar"
+#   files="`find . -type f -name "*.class"`"
+#   test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
+#   test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
+# popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -148,7 +148,7 @@
 # default security provider, provided by libgcj
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
 touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
-touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+# touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 
 # versionless symlinks
 pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -173,10 +173,10 @@
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin -type f -o -type l \
   | sed "s|^$RPM_BUILD_ROOT||"      > %{name}-%{version}-sdk-bin.files
 
-# install bouncy castle provider
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
-install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+# # install bouncy castle provider
+# install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+# install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
+#   $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -370,8 +370,8 @@
 %{_jvmjardir}/%{jrelnk}
 #%{_jvmprivdir}/*
 %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
-%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
-%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+# %{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+# %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -386,6 +386,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu May 26 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_28rh
+- Re-remove bouncy castle provider.
+
 * Thu May 26 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_27rh
 - Re-add bouncy castle provider. (#146782)