rpms/bouncycastle/devel .cvsignore, 1.2, 1.3 bouncycastle.spec, 1.2, 1.3 sources, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: fitzsim

Update of /cvs/dist/rpms/bouncycastle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28794

Modified Files:
	.cvsignore bouncycastle.spec sources 
Log Message:
* Tue Dec 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-2.fc7
- Install bcprov jar and unversioned symlink in %{_javadir}.
- Install bcprov symlink in %{_javadir}/gcj-endorsed.
- Change release numbering format to X.fc7.
- Include new bcprov files in files list.
- Import Bouncy Castle 1.34.
- Related: rhbz#218794




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bouncycastle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jul 2006 20:11:47 -0000	1.2
+++ .cvsignore	12 Dec 2006 20:46:30 -0000	1.3
@@ -1 +1 @@
-bcprov-jdk14-133-FEDORA.tar.gz
+bcprov-jdk14-134-FEDORA.tar.gz


Index: bouncycastle.spec
===================================================================
RCS file: /cvs/dist/rpms/bouncycastle/devel/bouncycastle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bouncycastle.spec	25 Jul 2006 11:33:56 -0000	1.2
+++ bouncycastle.spec	12 Dec 2006 20:46:30 -0000	1.3
@@ -1,14 +1,14 @@
-%define archivever  133
+%define archivever  134
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
-Version:          1.33
-Release:          3
+Version:          1.34
+Release:          2%{?dist}
 Group:            System Environment/Libraries
 License:          BSD
 URL:              http://www.%{name}.org/
-# bcprov-jdk14-133.tar.gz with patented algorithms removed.
-Source0:          bcprov-jdk14-133-FEDORA.tar.gz
+# bcprov-jdk14-134.tar.gz with patented algorithms removed.
+Source0:          bcprov-jdk14-134-FEDORA.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         jpackage-utils >= 1.5
 Requires:         java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_88rh
@@ -24,15 +24,16 @@
 The Bouncy Castle JCE provider.
 
 %prep
-%setup -q -n bcprov-jdk14-133
+%setup -q -n bcprov-jdk14-134
 
 # Remove provided binaries
 find . -type f -name "*.class" -exec rm -f {} \;
 find . -type f -name "*.jar" -exec rm -f {} \;
-find . -type f -name "*.zip" -exec rm -f {} \;
 
 %build
+mkdir src
 pushd src
+  unzip ../src.zip
   find . -type d -name examples | xargs rm -rf
   find . -type d -name test | xargs rm -rf
   javac `find . -type f -name "*.java"`
@@ -51,7 +52,13 @@
 # install bouncy castle provider
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
 install -pm 644 bcprov-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{version}.jar
+  $RPM_BUILD_ROOT%{_javadir}/bcprov-%{version}.jar
+pushd $RPM_BUILD_ROOT%{_javadir}
+  ln -sf bcprov-%{version}.jar bcprov.jar
+popd
+pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+  ln -sf %{_javadir}/bcprov-%{version}.jar bcprov-%{version}.jar
+popd
 
 %{_bindir}/aot-compile-rpm
 
@@ -83,11 +90,21 @@
 %files
 %defattr(0644,root,root,0755)
 %doc *.html
+%{_javadir}/bcprov.jar
+%{_javadir}/bcprov-%{version}.jar
 %{_javadir}/gcj-endorsed/bcprov-%{version}.jar
 %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 %attr(-,root,root) %{_libdir}/gcj/%{name}
 
 %changelog
+* Tue Dec 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-2.fc7
+- Install bcprov jar and unversioned symlink in %{_javadir}.
+- Install bcprov symlink in %{_javadir}/gcj-endorsed.
+- Change release numbering format to X.fc7.
+- Include new bcprov files in files list.
+- Import Bouncy Castle 1.34.
+- Related: rhbz#218794
+
 * Tue Jul 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.33-3
 - Bump release number.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bouncycastle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jul 2006 20:11:47 -0000	1.2
+++ sources	12 Dec 2006 20:46:30 -0000	1.3
@@ -1 +1 @@
-749a6cfc41b1240ee7e5babb70b44fbb  bcprov-jdk14-133-FEDORA.tar.gz
+a12703f06c032ba01bbae8de4ef8b0a5  bcprov-jdk14-134-FEDORA.tar.gz