rpms/gnu-crypto/devel .cvsignore, 1.4, 1.5 gnu-crypto.spec, 1.22, 1.23 sources, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 3 02:35:11 UTC 2006
Author: fitzsim
Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7810
Modified Files:
.cvsignore gnu-crypto.spec sources
Log Message:
* Thu Feb 2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.1.0-1jpp_1fc
- Import GNU Crypto 2.1.0.
- Remove gnu-crypto-jce-jdk1.4 and gnu-crypto-sasl-jdk1.4 packages.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Jun 2005 10:27:36 -0000 1.4
+++ .cvsignore 3 Feb 2006 02:34:56 -0000 1.5
@@ -1,4 +1 @@
-gnu-crypto-2.0.1.tar.bz2
-gnu-crypto-2.0.1
-i386
-*.src.rpm
+gnu-crypto-2.1.0.tar.bz2
Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnu-crypto.spec 22 Dec 2005 06:10:59 -0000 1.22
+++ gnu-crypto.spec 3 Feb 2006 02:34:56 -0000 1.23
@@ -1,19 +1,19 @@
%define gcj_support 1
Name: gnu-crypto
-Version: 2.0.1
-Release: 1jpp_11fc
+Version: 2.1.0
+Release: 1jpp_1fc
Epoch: 0
Summary: GNU Crypto library for Java
Group: Security/Cryptography
License: GPL with library exception
URL: http://www.gnu.org/software/gnu-crypto/
-Source0: http://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-Patch0: %{name}-crosslink.patch
+Source0: http://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.1.0.tar.bz2
+# Patch0: %{name}-crosslink.patch
# javax.security.auth.* is already in J2SE >= 1.4.
Patch1: %{name}-noauth.patch
-Patch2: %{name}-gcc41.patch
+# Patch2: %{name}-gcc41.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant, java-devel >= 0:1.4
@@ -41,32 +41,6 @@
implementations of cryptographic primitives and tools in the Java
programming language for use by programmers and end-users.
-%package sasl-jdk1.4
-Summary: Gnu Crypto SASL API
-Group: Security/Cryptography
-Provides: java-sasl
-%if %{gcj_support}
-Requires: libgcj >= 4.0.0-0.42
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
-
-%description sasl-jdk1.4
-%{summary}.
-
-%if %{gcj_support}
-%package jce-jdk1.4
-Summary: Gnu Crypto JCE API
-Group: Security/Cryptography
-Provides: jce
-Requires: libgcj >= 4.0.0-0.42
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description jce-jdk1.4
-%{summary}.
-%endif
-
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
@@ -78,15 +52,16 @@
%prep
%setup -q
-%patch0 -p0
+# %patch0 -p0
%if !%{gcj_support}
%patch1 -p0
%endif
-%patch2 -p1 -b .orig
+# %patch2 -p1 -b .orig
%build
-ant -Djdk2=true -Dj2se.apidoc=%{_javadocdir}/java jar javadoc2
+%configure
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -97,7 +72,7 @@
%endif
install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 lib/gnu-crypto.jar \
+install -pm 644 source/gnu-crypto.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%if %{gcj_support}
@@ -106,34 +81,8 @@
$RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-%{version}.jar
%endif
-install -dm 755 \
- $RPM_BUILD_ROOT%{_javadir}-{ext,1.4.0,1.4.1,1.4.2}
-install -pm 644 lib/javax-security.jar \
- $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
-for javaver in 1.4.0 1.4.1 1.4.2 ; do
- ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
- $RPM_BUILD_ROOT%{_javadir}-$javaver/sasl.jar
-done
-%if %{gcj_support}
-ln -s %{_javadir}-ext/%{name}-sasl-jdk1.4.jar \
- $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
-%endif
-
-# The jce subpackage is required for libgcj which does not contain
-# JCE.
-%if %{gcj_support}
-install -pm 644 lib/javax-crypto.jar \
- $RPM_BUILD_ROOT%{_javadir}-ext/%{name}-jce-jdk1.4.jar
-for javaver in 1.4.0 1.4.1 1.4.2 ; do
- ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
- $RPM_BUILD_ROOT%{_javadir}-$javaver/jce.jar
-done
-ln -s %{_javadir}-ext/%{name}-jce-jdk1.4.jar \
- $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
-%endif
-
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pR docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR source/overview.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
@@ -168,30 +117,6 @@
then
%{_bindir}/rebuild-gcj-db
fi
-
-%post sasl-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun sasl-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post jce-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun jce-jdk1.4
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
%endif
%post javadoc
@@ -210,30 +135,6 @@
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
%endif
-%files sasl-jdk1.4
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README THANKS
-%{_javadir}-ext/%{name}-sasl-jdk1.4.jar
-%{_javadir}-1.4.0/sasl.jar
-%{_javadir}-1.4.1/sasl.jar
-%{_javadir}-1.4.2/sasl.jar
-%if %{gcj_support}
-%{_javadir}/gcj-endorsed/%{name}-sasl-jdk1.4.jar
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-sasl-jdk1.4.jar.*
-%endif
-
-%if %{gcj_support}
-%files jce-jdk1.4
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING README THANKS
-%{_javadir}-ext/%{name}-jce-jdk1.4.jar
-%{_javadir}-1.4.0/jce.jar
-%{_javadir}-1.4.1/jce.jar
-%{_javadir}-1.4.2/jce.jar
-%{_javadir}/gcj-endorsed/%{name}-jce-jdk1.4.jar
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jce-jdk1.4.jar.*
-%endif
-
%files javadoc
%defattr(644,root,root,755)
%doc %{_javadocdir}/%{name}-%{version}
@@ -241,6 +142,10 @@
%changelog
+* Thu Feb 2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.1.0-1jpp_1fc
+- Import GNU Crypto 2.1.0.
+- Remove gnu-crypto-jce-jdk1.4 and gnu-crypto-sasl-jdk1.4 packages.
+
* Wed Dec 21 2005 Gary Benson <gbenson at redhat.com> - 0:2.0.1-1jpp_11fc
- Rebuild again
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Sep 2004 16:22:17 -0000 1.2
+++ sources 3 Feb 2006 02:34:56 -0000 1.3
@@ -1 +1 @@
-39ac686b8f7ecfb95de7d58c85b8935b gnu-crypto-2.0.1.tar.bz2
+f1ecdf394d3324c52bde35c134d7b098 gnu-crypto-2.1.0.tar.bz2
More information about the fedora-cvs-commits
mailing list