rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.53, 1.54 java-1.4.2-gcj-compat.spec, 1.169, 1.170 sources, 1.59, 1.60

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Aug 31 19:42:42 UTC 2006 

Author: fitzsim

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

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Thu Aug 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.105
- Comment out and obsolete plugin subpackage. (204728)
- Import java-gcj-compat 1.0.65.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	30 Aug 2006 14:37:53 -0000	1.53
+++ .cvsignore	31 Aug 2006 19:42:39 -0000	1.54
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.64.tar.gz
+java-gcj-compat-1.0.65.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar


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.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- java-1.4.2-gcj-compat.spec	30 Aug 2006 14:37:53 -0000	1.169
+++ java-1.4.2-gcj-compat.spec	31 Aug 2006 19:42:39 -0000	1.170
@@ -11,7 +11,7 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.64
+%define jgcver		1.0.65
 
 %define cname           java-%{javaver}-%{origin}
 
@@ -23,11 +23,11 @@
 %define jrebindir	%{_jvmdir}/%{jrelnk}/bin
 %define jvmjardir       %{_jvmjardir}/%{cname}-%{version}
 
-%define plugindir       %{_libdir}/mozilla/plugins
+# %define plugindir       %{_libdir}/mozilla/plugins
 
 Name:		java-%{javaver}-%{origin}-compat
 Version:	%{javaver}.%{buildver}
-Release: 	40jpp.104
+Release: 	40jpp.105
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -63,6 +63,7 @@
 Provides:	java-sasl
 Provides:	jce
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
+Obsoletes:	java-1.4.2-gcj-compat-plugin <= 1.4.2.0-40jpp.104
 PreReq:		chkconfig
 
 %description
@@ -122,21 +123,21 @@
 %description javadoc
 This package installs Javadoc API documentation for libgcj.
 
-%package plugin
-Summary:	Web browser plugin that handles applets
-Group:		Applications/Internet
-Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:       %{_sbindir}/update-alternatives
-Requires:	libgcj%{gccsuffix} >= %{gccver}
-Requires(post):       %{_sbindir}/update-alternatives
-Requires(postun):     %{_sbindir}/update-alternatives
-Requires(post): libgcj%{gccsuffix} >= %{gccver}
-Requires(postun): libgcj%{gccsuffix} >= %{gccver}
-Requires:	%{plugindir}
+# %package plugin
+# Summary:	Web browser plugin that handles applets
+# Group:		Applications/Internet
+# Provides:       java-plugin = %{javaver}, java-%{javaver}-plugin = %{version}
+# Requires:	%{name} = %{epoch}:%{version}-%{release}
+# Requires:       %{_sbindir}/update-alternatives
+# Requires:	libgcj%{gccsuffix} >= %{gccver}
+# Requires(post):       %{_sbindir}/update-alternatives
+# Requires(postun):     %{_sbindir}/update-alternatives
+# Requires(post): libgcj%{gccsuffix} >= %{gccver}
+# Requires(postun): libgcj%{gccsuffix} >= %{gccver}
+# Requires:	%{plugindir}
 
-%description plugin
-This package installs gcjwebplugin, a Mozilla plugin for applets.
+# %description plugin
+# This package installs gcjwebplugin, a Mozilla plugin for applets.
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
@@ -428,10 +429,10 @@
   ln -sf %{name}-%{version} %{_javadocdir}/java
 } || :
 
-%post plugin
+# %post plugin
 
-  update-alternatives --install %{plugindir}/libjavaplugin.so \
-    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+#   update-alternatives --install %{plugindir}/libjavaplugin.so \
+#     libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -474,10 +475,10 @@
    update-alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
-%postun plugin
-if [ $1 -eq 0 ] ; then
-   update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
-fi
+# %postun plugin
+# if [ $1 -eq 0 ] ; then
+#    update-alternatives --remove libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so
+# fi
 
 %triggerin -- libgcj%{gccsuffix} > %{gccver}
 {
@@ -576,17 +577,17 @@
     %{_jvmdir}/%{cname}-%{version}/src.zip
 } || :
 
-%triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
-{
-
-%if %{custom}
-export PATH=%{gcj_prefix}/bin:$PATH
-%endif
+# %triggerin plugin -- libgcj%{gccsuffix} > %{gccver}
+# {
 
-  # plugin
-  update-alternatives --install %{plugindir}/libjavaplugin.so \
-    libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
-} || :
+# %if %{custom}
+# export PATH=%{gcj_prefix}/bin:$PATH
+# %endif
+
+#   # plugin
+#   update-alternatives --install %{plugindir}/libjavaplugin.so \
+#     libjavaplugin.so %{_libdir}/gcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`/libgcjwebplugin.so %{priority}
+# } || :
 
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
@@ -642,12 +643,16 @@
 %ghost %doc %{_javadocdir}/%{name}
 %ghost %doc %{_javadocdir}/java
 
-%files plugin
-%defattr(-,root,root)
+# %files plugin
+# %defattr(-,root,root)
 
 %changelog
+* Thu Aug 31 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.105
+- Comment out and obsolete plugin subpackage. (204728)
+- Import java-gcj-compat 1.0.65.
+
 * Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.104
-- Import java-gcj-comapt 1.0.64.
+- Import java-gcj-compat 1.0.64.
 
 * Tue Aug 29 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.103
 - Import java-gcj-compat 1.0.63.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources	30 Aug 2006 14:37:53 -0000	1.59
+++ sources	31 Aug 2006 19:42:39 -0000	1.60
@@ -1,3 +1,3 @@
-14047b4e3b77361df68698c8275189ad  java-gcj-compat-1.0.64.tar.gz
+84d12257e981648454dc042639a1936e  java-gcj-compat-1.0.65.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar

More information about the fedora-cvs-commits mailing list