rpms/java-1.5.0-gcj/devel .cvsignore, 1.2, 1.3 java-1.5.0-gcj.spec, 1.6, 1.7 sources, 1.2, 1.3
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Sat Mar 17 03:49:58 UTC 2007
Author: fitzsim
Update of /cvs/extras/rpms/java-1.5.0-gcj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28138
Modified Files:
.cvsignore java-1.5.0-gcj.spec sources
Log Message:
* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4.fc7
- 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Mar 2007 21:09:27 -0000 1.2
+++ .cvsignore 17 Mar 2007 03:49:25 -0000 1.3
@@ -1 +1 @@
-java-gcj-compat-1.0.70.tar.gz
+java-gcj-compat-1.0.72.tar.gz
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- java-1.5.0-gcj.spec 16 Mar 2007 16:44:25 -0000 1.6
+++ java-1.5.0-gcj.spec 17 Mar 2007 03:49:25 -0000 1.7
@@ -19,7 +19,7 @@
# the version-release string for the gcj rpms we require
%define gccver 4.1.2
# the version string for the java-gcj-compat release we require
-%define jgcver 1.0.70
+%define jgcver 1.0.72
# hard-code libdir on 64-bit architectures to make the 64-bit JDK
# simply be another alternative
@@ -65,14 +65,13 @@
Name: %{name}
Version: %{javaver}.%{buildver}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: JPackage runtime compatibility layer for GCJ
Group: Development/Languages
License: GPL
URL: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
Source0: java-gcj-compat-%{jgcver}.tar.gz
-Patch0: java-gcj-compat-sun-rmi-classpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,10 +82,6 @@
%if ! %{bootstrap}
BuildRequires: sinjdoc
%endif
-# FIXME: remove after tools.jar merge lands in Rawhide. This is
-# needed for /usr/share/java/com-sun-javadoc-0.7.7.jar and
-# /usr/share/java/com-sun-tools-doclets-Taglet-0.7.7.jar.
-BuildRequires: gjdoc
# required for tools and libgcj.jar
Requires: libgcj%{gccsuffix} >= %{gccver}
@@ -140,7 +135,7 @@
Provides: jaxp_parser_impl = %{version}-%{release}
# java-gcj-compat base provides
Provides: java-gcj-compat = %{jgcver}
-Provides: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp.111
+Provides: java-1.4.2-gcj-compat > 1.4.2.0-40jpp.111
Obsoletes: java-1.4.2-gcj-compat <= 1.4.2.0-40jpp.111
@@ -177,7 +172,7 @@
Provides: java-devel = %{javaver}
# java-gcj-compat devel provides
Provides: java-gcj-compat-devel = %{jgcver}
-Provides: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp.111
+Provides: java-1.4.2-gcj-compat-devel > 1.4.2.0-40jpp.111
Obsoletes: java-1.4.2-gcj-compat-devel <= 1.4.2.0-40jpp.111
@@ -196,7 +191,7 @@
Requires(post): %{_bindir}/gij%{gccsuffix}
# java-gcj-compat src provides
-Provides: java-1.4.2-gcj-compat-src >= 1.4.2.0-40jpp.111
+Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
Obsoletes: java-1.4.2-gcj-compat-src <= 1.4.2.0-40jpp.111
@@ -216,7 +211,7 @@
Provides: java-javadoc = %{version}-%{release}
Provides: java-%{javaver}-javadoc = %{version}-%{release}
# java-gcj-compat javadoc provides
-Provides: java-1.4.2-gcj-compat-javadoc >= 1.4.2.0-40jpp.111
+Provides: java-1.4.2-gcj-compat-javadoc > 1.4.2.0-40jpp.111
Obsoletes: java-1.4.2-gcj-compat-javadoc <= 1.4.2.0-40jpp.111
@@ -250,7 +245,7 @@
Provides: java-plugin = %{javaver}
Provides: java-%{javaver}-plugin = %{version}
# java-gcj-compat plugin provides
-Provides: java-1.4.2-gcj-compat-plugin >= 1.4.2.0-40jpp.111
+Provides: java-1.4.2-gcj-compat-plugin > 1.4.2.0-40jpp.111
Obsoletes: java-1.4.2-gcj-compat-plugin <= 1.4.2.0-40jpp.111
@@ -261,7 +256,6 @@
%prep
%setup -q -n java-gcj-compat-%{jgcver}
-%patch0 -p0
%build
%configure --disable-symlinks --with-arch-directory=%{_arch} \
@@ -463,8 +457,6 @@
%{_bindir}/rebuild-gcj-db
fi
-rm -f %{_sysconfdir}/java/security/security.d/*.rpmnew
-
%triggerin -- libgcj%{gccsuffix} >= %{gccver}
{
GIJ_VERSION=$(gij%{gccsuffix} --version | head -n 2 | tail -n 1 \
@@ -671,11 +663,17 @@
%ghost %{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
%ghost %{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
%ghost %{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
-%config(noreplace) %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
-%config(noreplace) %{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
-%config(noreplace) %{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
-%config(noreplace) %{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
-%config(noreplace) %{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
+# these must not be marked %config(noreplace). their names are used by
+# rebuild-security-providers, which lists
+# %{_sysconfdir}/java/security/security.d/*. their contents are
+# ignored, so replacing them doesn't matter. .rpmnew files are
+# harmful since they're interpreted by rebuild-security-providers as
+# classnames ending in rpmnew.
+%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
+%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
+%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
+%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
+%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
# FIXME: remove after gcc update:
%{_jvmdir}/java-1.4.2-gcj-1.4.2.0/jre/lib/rt.jar
@@ -732,6 +730,13 @@
%endif
%changelog
+* Fri Mar 16 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.5.0.0-4.fc7
+- 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
- Require sinjdoc.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/java-1.5.0-gcj/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Mar 2007 21:09:27 -0000 1.2
+++ sources 17 Mar 2007 03:49:25 -0000 1.3
@@ -1 +1 @@
-7a37e802288747798b01cfa296b3f87f java-gcj-compat-1.0.70.tar.gz
+f42fb313f965d9c4f504c52ecd610c2b java-gcj-compat-1.0.72.tar.gz
More information about the fedora-extras-commits
mailing list