From 536e2ecec3b16158fbdc79be8c7f7c3bb37a04a4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 28 Jun 2019 14:27:53 +0200
Subject: [PATCH] Use javadoc_package macro

---
 sisu.spec | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/sisu.spec b/sisu.spec
index ee72be2..67c735a 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,7 +1,3 @@
-# Release type, either "milestone" or "release"
-%global reltype release
-#global reltag .M1
-
 Name:           sisu
 Epoch:          1
 Version:        0.3.3
@@ -11,9 +7,10 @@ Summary:        Eclipse dependency injection framework
 # bundled asm is BSD
 License:        EPL-1.0 and BSD
 URL:            http://eclipse.org/sisu
+BuildArch:      noarch
 
-Source0:        http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.bz2
-Source1:        http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.bz2
+Source0:        http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.inject-%{version}.tar.bz2
+Source1:        http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}.tar.bz2
 
 Source100:      %{name}-parent.pom
 Source101:      %{name}-inject.pom
@@ -23,8 +20,6 @@ Patch0:         %{name}-OSGi-import-guava.patch
 Patch2:         %{name}-ignored-tests.patch
 Patch3:         %{name}-osgi-api.patch
 
-BuildArch:      noarch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.inject.extensions:guice-servlet)
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
@@ -42,7 +37,6 @@ BuildRequires:  mvn(org.testng:testng)
 
 Provides:       bundled(objectweb-asm)
 
-
 %description
 Java dependency injection framework with backward support for plexus and bean
 style dependency injection.
@@ -59,16 +53,12 @@ Summary:        Sisu Plexus
 %description    plexus
 This package contains %{summary}.
 
-%package        javadoc
-Summary:        API documentation for Sisu
-
-%description    javadoc
-This package contains %{summary}.
+%{?javadoc_package}
 
 %prep
 %setup -q -c -T
-tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
-tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
+tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
+tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
 
 cp %{SOURCE100} pom.xml
 cp %{SOURCE101} sisu-inject/pom.xml
@@ -92,14 +82,10 @@ cp %{SOURCE102} sisu-plexus/pom.xml
 %mvn_install
 
 %files inject -f .mfiles-inject
-%doc sisu-inject/LICENSE.txt
+%license sisu-inject/LICENSE.txt
 
 %files plexus -f .mfiles-plexus
 
-%files javadoc -f .mfiles-javadoc
-%doc sisu-inject/LICENSE.txt
-
-
 %changelog
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.3.3-7
 - Mass rebuild for javapackages-tools 201901