rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.42,1.43

Thomas Fitzsimmons (fitzsim) fedora-extras-commits at redhat.com
Tue Jan 22 17:21:02 UTC 2008 

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23439

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Jan 21 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.24.b24
- Remove cgibindir macro.
- Remove icedtearelease.
- Remove binfmt_misc support.
- Remove .snapshot from changelog lines wider than 80 columns.




Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- java-1.7.0-icedtea.spec	8 Jan 2008 15:55:31 -0000	1.42
+++ java-1.7.0-icedtea.spec	22 Jan 2008 17:20:23 -0000	1.43
@@ -5,7 +5,6 @@
 
 %define icedteaver 1.5
 %define icedteasnapshot %{nil}
-%define icedtearelease snapshot
 %define openjdkver b24
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.7.0-icedtea/
@@ -97,14 +96,12 @@
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
 %endif
 
-%define cgibindir       %{_var}/www/cgi-bin
-
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.23.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.24.%{openjdkver}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -331,10 +328,6 @@
 
 pushd %{buildoutputdir}/j2sdk-image
 
-  # Assume that java-rmi.cgi is not used.
-  # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4418631
-  rm -f bin/java-rmi.cgi
-
   # Install main files.
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
   cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
@@ -402,6 +395,8 @@
 
   # Install demos and samples.
   cp -a demo $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
+  mkdir -p sample/rmi
+  mv bin/java-rmi.cgi sample/rmi
   cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
 
 popd
@@ -446,16 +441,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if test -f /proc/sys/fs/binfmt_misc/jarexec
-then
-  echo '-1' > /proc/sys/fs/binfmt_misc/jarexec
-fi
-if test -f /proc/sys/fs/binfmt_misc/register
-then
-  echo ':jarexec:M::PK\x03\x04::%{_jvmdir}/%{jredir}/lib/jexec:' \
-    > /proc/sys/fs/binfmt_misc/register
-fi
-
 ext=.gz
 alternatives \
   --install %{_bindir}/java java %{jrebindir}/java %{priority} \
@@ -517,11 +502,6 @@
 %postun
 if [ $1 -eq 0 ]
 then
-  if test -f /proc/sys/fs/binfmt_misc/jarexec
-  then
-    echo '-1' > /proc/sys/fs/binfmt_misc/jarexec
-  fi
-
   alternatives --remove java %{jrebindir}/java
   alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
   alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
@@ -756,6 +736,12 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Jan 21 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.24.b24
+- Remove cgibindir macro.
+- Remove icedtearelease.
+- Remove binfmt_misc support.
+- Remove .snapshot from changelog lines wider than 80 columns.
+
 * Tue Jan 08 2008 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.23.b24.snapshot
 - Added xorg-x11-fonts-misc as a build requirement for Mauve.
 - Updated mauve_tests.
@@ -793,23 +779,23 @@
 - Resolves rhbz#399221
 - Resolves rhbz#318621
 
-* Thu Dec  6 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.22.b23.snapshot
+* Thu Dec  6 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.22.b23
 - Clear bootstrap mode on ppc and ppc64.
 
-* Wed Dec  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.21.b23.snapshot
+* Wed Dec  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.21.b23
 - Update icedteasnapshot.
 
-* Fri Nov 30 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.21.b23.snapshot
+* Fri Nov 30 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.21.b23
 - Update icedteasnapshot.
 - Remove ExclusiveArch.
 - Assume i386.
 - Add support for ppc and ppc64.
 - Bootstrap on ppc and ppc64.
 
-* Thu Nov 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.20.b23.snapshot
+* Thu Nov 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.20.b23
 - Add giflib-devel build requirement.
 
-* Thu Nov 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.20.b23.snapshot
+* Thu Nov 15 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.20.b23
 - Add libjpeg-devel and libpng-devel build requirements.
 
 * Thu Nov 15 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.20.b23.snapshot
@@ -850,7 +836,7 @@
 * Fri Sep 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
 - Fixed testing. Output is stored in a file and passes/debug info is not shown.
 
-* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19.snapshot
+* Thu Sep 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.16.b19
 - Apply patch to use system tzdata.
 - Require tzdata-java.
 - Fix mauve shell fragment.
@@ -877,7 +863,7 @@
 - Added mauve_tests as source.
 - Run Mauve after build for regression testing.
 
-* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Thu Sep  7 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18
 - Do not require openssl for build.
 - Require openssl.
 - Set gcjbootstrap to 0.
@@ -887,19 +873,19 @@
 - Update openjdkver.
 - Update openjdkdate.
 
-* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18
 - Rename javadoc master alternative javadocdir.
 - Resolves: rhbz#269901
 
-* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+* Wed Sep  5 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.15.b18
 - Remove epoch in plugin provides.
 - Bump release number.
 - Resolves: rhbz#274001
 
-* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18.snapshot
+* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18
 - Include idlj man page in files list.
 
-* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18.snapshot
+* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.14.b18
 - Add documentation for plugin and src subpackages.
 - Fix plugin alternative on x86_64.
 - Add java-1.7.0-icedtea-win32.patch.
@@ -916,24 +902,24 @@
 - Updated genurl.
 - Updated icedteasnapshot.
 
-* Fri Aug 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.13.b18.snapshot
+* Fri Aug 24 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.13.b18
 - Remove RMI CGI script and subpackage.
 - Fix Java Access Bridge for GNOME URL.
 
-* Thu Aug 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.12.b18.snapshot
+* Thu Aug 23 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.12.b18
 - Fully qualify Java Access Bridge for GNOME and generate-cacerts
   source paths.
 - Fix plugin post alternatives invocation.
 - Include IcedTea documentation.
 - Update icedteasnapshot.
 
-* Tue Aug 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18.snapshot
+* Tue Aug 21 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18
 - Revert change to configure macro.
 
-* Mon Aug 20 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18.snapshot
+* Mon Aug 20 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18
 - Fix rpmlint errors.
 
-* Mon Aug 20 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18.snapshot
+* Mon Aug 20 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.7.0.0-0.11.b18
 - Add missing development alternatives.
 - Bump accessver to 1.19.2.
 - Bump icedteaver.

More information about the fedora-extras-commits mailing list