pool/bouncycastle
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 198682 from Java:packages

Browse Source 
jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198682
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bouncycastle?expand=0&rev=5
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:05:08 +00:00 committed by Git OBS Bridge
commit 9b2df360d8
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bouncycastle.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Sep 9 11:05:33 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Wed Aug 28 08:25:18 UTC 2013 - mvyskocil@suse.com
- use add_maven_depmap from recent javapackages-tools
- temporary mozilla-nss to BT: in order to pass a tests
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 18 12:39:28 UTC 2012 - mvyskocil@suse.cz Fri May 18 12:39:28 UTC 2012 - mvyskocil@suse.cz

21
bouncycastle.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package bouncycastle # spec file for package bouncycastle
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,6 @@
%define ver 1.46 %define ver 1.46
%define archivever jdk16-%(echo %{ver}|sed 's|\\\.||') %define archivever jdk16-%(echo %{ver}|sed 's|\\\.||')
%define classname org.bouncycastle.jce.provider.BouncyCastleProvider %define classname org.bouncycastle.jce.provider.BouncyCastleProvider
%define _mavenpomdir %{_datadir}/maven2/poms
Summary: Bouncy Castle Crypto Package for Java Summary: Bouncy Castle Crypto Package for Java
License: MIT License: MIT
@ -37,12 +36,14 @@ Source0: bcprov-%{archivever}-FEDORA.tar.gz
#Source1: http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/%{version}/bcprov-jdk16-%{version}.pom #Source1: http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/%{version}/bcprov-jdk16-%{version}.pom
Source1: bcprov-jdk16-%{version}.pom Source1: bcprov-jdk16-%{version}.pom
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: jpackage-utils >= 1.5 BuildRequires: javapackages-tools
Requires(post): jpackage-utils >= 1.7 Requires(post): javapackages-tools
Requires(postun): jpackage-utils >= 1.7 Requires(postun): javapackages-tools
BuildArch: noarch BuildArch: noarch
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: unzip BuildRequires: unzip
#FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
BuildRequires: mozilla-nss
Requires: java Requires: java
BuildRequires: junit4 BuildRequires: junit4
@ -59,7 +60,7 @@ Summary: Javadoc for %{name}
Group: Development/Libraries/Java Group: Development/Libraries/Java
BuildArch: noarch BuildArch: noarch
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils Requires: javapackages-tools
%description javadoc %description javadoc
API documentation for the %{name} package. API documentation for the %{name} package.
@ -109,7 +110,7 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# maven pom # maven pom
install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov.pom
%add_to_maven_depmap org.bouncycastle bcprov-jdk16 %{version} JPP bcprov %add_maven_depmap JPP-bcprov.pom bcprov.jar
%check %check
pushd src pushd src
@ -143,8 +144,6 @@ popd
done done
} || : } || :
%update_maven_depmap
%postun %postun
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
@ -170,7 +169,6 @@ if [ $1 -eq 0 ] ; then
} || : } || :
fi fi
%update_maven_depmap
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
@ -178,10 +176,9 @@ fi
%{_javadir}/bcprov.jar %{_javadir}/bcprov.jar
%{_javadir}/bcprov-%{version}.jar %{_javadir}/bcprov-%{version}.jar
%{_javadir}/* %{_javadir}/*
%{_sysconfdir}/java/* %config(noreplace) %{_sysconfdir}/java/*
%{_mavenpomdir}/JPP-bcprov.pom %{_mavenpomdir}/JPP-bcprov.pom
%config %{_mavendepmapfragdir}/%{name} %config %{_mavendepmapfragdir}/%{name}
%dir /usr/share/maven2
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)