Cleanups: using rather add_maven_depmap macro for creating the compatibility package...

diff --git a/bouncycastle1.46/bouncycastle1.46.spec b/bouncycastle1.46/bouncycastle1.46.spec
index 411ae93..2ec67eb 100644 (file)
--- a/bouncycastle1.46/bouncycastle1.46.spec
+++ b/bouncycastle1.46/bouncycastle1.46.spec
@@ -1,5 +1,4 @@
 %global ver  1.46
-%global jarver %(echo %{ver}|sed 's|\\\.||')
 %global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
@@ -20,9 +19,6 @@ BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    junit
 
-Provides:         bcprov = %{version}-%{release}
-Provides:         bcprov%{jarver} = %{version}-%{release}
-
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
 algorithms. The package is organised so that it contains a light-weight API
@@ -57,7 +53,7 @@ find . -type f -name "*.jar" -exec rm -f {} \;
 pushd src
   export CLASSPATH=$(build-classpath junit)
   %javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
-  jarfile="../bcprov%{jarver}.jar"
+  jarfile="../bcprov.jar"
   # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
   files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')"
@@ -72,18 +68,20 @@ popd
 
 %install
 # install bouncy castle provider
-install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 bcprov%{jarver}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/
+install -dm 755 %{buildroot}%{_javadir}
+install -pm 644 bcprov.jar \
+  %{buildroot}%{_javadir}/
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
 
 # maven pom
-install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcprov%{jarver}.pom
-%add_maven_depmap JPP-bcprov%{jarver}.pom bcprov%{jarver}.jar
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcprov.pom
+# -v: compatibility package for %%{ver}
+# -a: alias without flavour
+%add_maven_depmap -v %{ver} -a org.bouncycastle:bcprov JPP-bcprov.pom bcprov.jar
 
 
 %check
@@ -106,5 +104,5 @@ popd
 
 
 %changelog
-* Wed Aug 10 2016 František Dvořák <valtri@civ.zcu.cz> - 1.46-1
+* Thu Sep 08 2016 František Dvořák <valtri@civ.zcu.cz> - 1.46-1
 - Initial package (based on Fedora/EPEL)