rpms/bouncycastle/F-9 .cvsignore, 1.4, 1.5 bouncycastle.spec, 1.7, 1.8 sources, 1.4, 1.5

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/bouncycastle/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6931

Modified Files:
	.cvsignore bouncycastle.spec sources 
Log Message:
* Wed Nov 12 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.41-2
- Fixed license tag (BSD -> MIT).
- Minor improvements in the SPEC file for better compatibility with the
  Fedora Java Packaging Guidelines.
- Added "Provides: bcprov == %%{version}-%%{release}".

* Thu Oct  2 2008 Lillian Angel <langel at redhat.com> - 1.41-1
- Import Bouncy Castle 1.41.
- Resolves: rhbz#465203

* Thu May 15 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.39-1
- Import Bouncy Castle 1.39.
- Set target to 1.5.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Nov 2007 22:46:32 -0000	1.4
+++ .cvsignore	12 Nov 2008 18:04:09 -0000	1.5
@@ -1 +1 @@
-bcprov-jdk16-138-FEDORA.tar.gz
+bcprov-jdk16-141.tar.gz


Index: bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-9/bouncycastle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bouncycastle.spec	19 Feb 2008 03:02:24 -0000	1.7
+++ bouncycastle.spec	12 Nov 2008 18:04:09 -0000	1.8
@@ -1,25 +1,32 @@
-%define archivever  jdk16-138
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%define archivever  jdk16-141
 %define classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
-Version:          1.38
+Version:          1.41
 Release:          2%{?dist}
 Group:            System Environment/Libraries
-License:          BSD
+License:          MIT
 URL:              http://www.%{name}.org/
 # bcprov-%{archivever}.tar.gz with patented algorithms removed.
-Source0:          bcprov-%{archivever}-FEDORA.tar.gz
+Source0:          bcprov-%{archivever}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:         jpackage-utils >= 1.5
+%if %{with_gcj}
 Requires:         java-1.5.0-gcj
 Requires(post):   java-gcj-compat
 Requires(postun): java-gcj-compat
-BuildRequires:    java-1.7.0-icedtea-devel
 BuildRequires:    java-gcj-compat-devel
+%else
+BuildArch:        noarch
+%endif
+BuildRequires:    java-devel >= 1.7
 BuildRequires:    jpackage-utils >= 1.5
 BuildRequires:    junit4
 
+Provides:         bcprov == %{version}-%{release}
+
 %description
 The Bouncy Castle JCE provider.
 
@@ -30,12 +37,13 @@
 find . -type f -name "*.class" -exec rm -f {} \;
 find . -type f -name "*.jar" -exec rm -f {} \;
 
-%build
 mkdir src
+unzip -qq src.zip -d src/
+
+%build
 pushd src
-  unzip ../src.zip
   export CLASSPATH=$(build-classpath junit4)
-  javac `find . -type f -name "*.java"`
+  javac -target 1.5 `find . -type f -name "*.java"`
   jarfile="../bcprov-%{version}.jar"
   files="`find . -type f -name "*.class"`"
   test ! -d classes && mf="" \
@@ -51,17 +59,19 @@
 touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-%{classname}
 
 # install bouncy castle provider
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 install -pm 644 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
+%if %{with_gcj}
+  install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+  pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+    ln -sf ../bcprov-%{version}.jar bcprov-%{version}.jar
+  popd
+  %{_bindir}/aot-compile-rpm
+%endif
 
 %post
 {
@@ -85,9 +95,11 @@
   done
 } || :
 
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
+%if %{with_gcj}
+  if [ -x %{_bindir}/rebuild-gcj-db ]; then
+    %{_bindir}/rebuild-gcj-db
+  fi
+%endif
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -113,9 +125,11 @@
     done
   } || :
 
-  if [ -x %{_bindir}/rebuild-gcj-db ]; then
-    %{_bindir}/rebuild-gcj-db
-  fi
+  %if %{with_gcj}
+    if [ -x %{_bindir}/rebuild-gcj-db ]; then
+      %{_bindir}/rebuild-gcj-db
+    fi
+  %endif
 
 fi
 
@@ -123,15 +137,32 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc *.html
 %{_javadir}/bcprov.jar
 %{_javadir}/bcprov-%{version}.jar
-%{_javadir}/gcj-endorsed/bcprov-%{version}.jar
+%if %{with_gcj}
+  %{_javadir}/gcj-endorsed/bcprov-%{version}.jar
+  %{_libdir}/gcj/%{name}
+%endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+
 
 %changelog
+* Wed Nov 11 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> 1.41-2
+- Fixed license tag (BSD -> MIT).
+- Minor improvements in the SPEC file for better compatibility with the 
+  Fedora Java Packaging Guidelines.
+- Added "Provides: bcprov == %%{version}-%%{release}".
+
+* Thu Oct  2 2008 Lillian Angel <langel at redhat.com> - 1.41-1
+- Import Bouncy Castle 1.41.
+- Resolves: rhbz#465203
+
+* Thu May 15 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.39-1
+- Import Bouncy Castle 1.39.
+- Set target to 1.5.
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.38-2
 - Autorebuild for GCC 4.3
 
@@ -147,8 +178,8 @@
 - Require java-1.5.0-gcj.
 
 * Tue Dec 12 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 1.34-2
-- Install bcprov jar and unversioned symlink in %{_javadir}.
-- Install bcprov symlink in %{_javadir}/gcj-endorsed.
+- 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bouncycastle/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2007 22:46:33 -0000	1.4
+++ sources	12 Nov 2008 18:04:09 -0000	1.5
@@ -1 +1 @@
-489fd3910ab9bc7b7b177168dca6bf1c  bcprov-jdk16-138-FEDORA.tar.gz
+dc026eb9180a9b29c19a03f1771814c4  bcprov-jdk16-141.tar.gz