diff --git a/_service b/_service
new file mode 100644
index 0000000..653c514
--- /dev/null
+++ b/_service
@@ -0,0 +1,17 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/junit-team/junit4.git</param>
+		<param name="revision">r4.13.2</param>
+		<param name="match-tag">r*</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">r(.*)</param>
+        <param name="exclude">**/*.jar</param>
+        <param name="filename">junit</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
diff --git a/build.xml b/build.xml
index 9a2242b..ead5ff0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,395 +1,119 @@
-<project name="junit" default="dist" basedir="."
-         xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-  <tstamp />
-  <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+<?xml version="1.0" encoding="UTF-8"?>
 
-  <property file="${user.home}/.junit.properties" />
-  <property name="src" value="src/main/java" />
-  <property name="target" location="target" />
-  <property name="bin" location="${target}/main" />
-  <property name="version-base" value="4.13.2" />
-  <property name="version-bundle" value="${version-base}" />
-  <property name="version-status" value="-SNAPSHOT" />
-  <property name="version" value="${version-base}${version-status}" />
-  <property name="dist" value="junit${version}" />
-  <property name="versionfile" value="${src}/junit/runner/Version.java" />
-  <property name="zipfile"  value="${dist}/${dist}.zip" />
-  <property name="testsrc" location="src/test/java" />
-  <property name="testrsrc" location="src/test/resources" />
-  <property name="testbin" location="${target}/test/java" />
-  <property name="unjarred" 
-            value="**/*.jar, ${testfiles}, doc/**, README.html, .classpath, .project, cpl-v10.html" />
+<project name="junit" default="package" basedir=".">
 
-  <property name="binjar" value="junit-${version}.jar" />
-  <property name="srcjar" value="junit-${version}-src.jar" />
-  <property name="docjar" value="junit-${version}-javadoc.jar" />
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
 
-  <property name="depjar" value="junit-dep-${version}.jar" />
-  <property name="depsrcjar" value="junit-dep-${version}-src.jar" />
-  <property name="depdocjar" value="junit-dep-${version}-javadoc.jar" />
+  <property file="build.properties"/>
 
-  <property name="javadocdir" location="${dist}/javadoc" />
-  <property name="javadoczip" location="${dist}-javadoc.zip" />
-  <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
-  <property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
-  <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
+  <property name="build.finalName" value="junit-4.13.2"/>
+  <property name="build.dir" value="target"/>
+  <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
 
-  <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
-  
-  <property name="compiler.release" value="8" />
-  <property name="compiler.source" value="1.${compiler.release}" />
-  <property name="compiler.target" value="${compiler.source}" />
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
-  <target name="init">
-    <tstamp/>
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
   </target>
 
-  <target name="versiontag" depends="init">
-    <filter token="version" value="${version}" />
-  
-    <copy 
-        file="${versionfile}.template" 
-        tofile="${versionfile}" 
-        filtering="on"
-        overwrite="true"
-        />
-  </target>
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
 
-  <target name="clean">
-    <!-- If two builds are made within a minute -->
-    <delete dir="${dist}" quiet="true" />
-    <!-- Delete all previous temporary build artifacts -->
-    <delete dir="${target}" quiet="true" />
-    
-    <delete file="${zipfile}" quiet="true"/>
-    <delete file="${javadoczip}" />
-  </target>
-
-  <macrodef name="junit_compilation">
-    <attribute name="srcdir"/>
-    <attribute name="destdir"/>
-    <attribute name="classpath"/>
-    <sequential>
-      <mkdir dir="@{destdir}"/>
-      <javac 
-          srcdir="@{srcdir}"
-          destdir="@{destdir}"
-          debug="on"
-          classpath="@{classpath}"
-          includeantruntime="false"
-          release="${compiler.release}"
-          source="${compiler.source}"
-          target="${compiler.target}"
-          >
-        <compilerarg value="-Xlint:unchecked" />
-      </javac>
-    </sequential>
-  </macrodef>
-  
-  <target name="build" depends="versiontag">
-    <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
-    <unjar src="${hamcrestlib}" dest="${bin}" />
-    <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
-  </target>
-
-  <target name="jars" depends="build">
-    <mkdir dir="${dist}" />
-    <jar 
-        jarfile="${dist}/${srcjar}"
-        basedir="${src}"
-        excludes="${unjarred}, **/*.class"
-        />
-    <jar 
-        jarfile="${dist}/${binjar}"
-        basedir="${bin}"
-        excludes="${unjarred}, **/*.java, build.xml">
-      <manifest>
-		<attribute name="Automatic-Module-Name" value="junit"/>
-		<attribute name="Bundle-Description" value="JUnit is a unit testing framework for Java, created by Erich Gamma and Kent Beck."/>
-		<attribute name="Bundle-DocURL" value="http://www.junit.org"/>
-		<attribute name="Bundle-License" value="http://www.eclipse.org/legal/epl-v10.html"/>
-		<attribute name="Bundle-ManifestVersion" value="2"/>
-		<attribute name="Bundle-Name" value="JUnit"/>
-		<attribute name="Bundle-SymbolicName" value="org.junit"/>
-		<attribute name="Bundle-Vendor" value="JUnit"/>
-		<attribute name="Bundle-Version" value="${version-bundle}"/>
-		<attribute name="Export-Package" value="junit.extensions;version=&quot;${version-bundle}&quot;,junit.framework;version=&quot;${version-bundle}&quot;,junit.runner;version=&quot;${version-bundle}&quot;,junit.textui;version=&quot;${version-bundle}&quot;,org.junit.experimental.categories;version=&quot;${version-bundle}&quot;,org.junit.experimental.max;version=&quot;${version-bundle}&quot;,org.junit.experimental.results;version=&quot;${version-bundle}&quot;,org.junit.experimental.runners;version=&quot;${version-bundle}&quot;,org.junit.experimental.theories.internal;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.experimental.theories.suppliers;version=&quot;${version-bundle}&quot;,org.junit.experimental.theories;version=&quot;${version-bundle}&quot;,org.junit.experimental;version=&quot;${version-bundle}&quot;,org.junit.function;version=&quot;${version-bundle}&quot;,org.junit.internal.builders;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.management;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.matchers;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.requests;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.runners.model;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.runners.rules;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.runners.statements;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal.runners;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.internal;x-internal:=true;version=&quot;${version-bundle}&quot;,org.junit.matchers;version=&quot;${version-bundle}&quot;,org.junit.rules;version=&quot;${version-bundle}&quot;,org.junit.runner.manipulation;version=&quot;${version-bundle}&quot;,org.junit.runner.notification;version=&quot;${version-bundle}&quot;,org.junit.runner;version=&quot;${version-bundle}&quot;,org.junit.runners.model;version=&quot;${version-bundle}&quot;,org.junit.runners.parameterized;version=&quot;${version-bundle}&quot;,org.junit.runners;version=&quot;${version-bundle}&quot;,org.junit.validator;version=&quot;${version-bundle}&quot;,org.junit;version=&quot;${version-bundle}&quot;"/>
-		<attribute name="Implementation-Title" value="JUnit"/>
-		<attribute name="Implementation-URL" value="http://junit.org"/>
-		<attribute name="Implementation-Vendor" value="JUnit"/>
-		<attribute name="Implementation-Vendor-Id" value="junit"/>
-		<attribute name="Implementation-Version" value="${version-base}"/>
-		<attribute name="Import-Package" value="junit.extensions,junit.framework,junit.runner,org.hamcrest.core,org.hamcrest,org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.function,org.junit.internal,org.junit.internal.builders,org.junit.internal.management,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator"/>
-		<attribute name="JavaPackages-ArtifactId" value="junit"/>
-		<attribute name="JavaPackages-GroupId" value="junit"/>
-		<attribute name="JavaPackages-Version" value="${version-base}"/>
-		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
-	  </manifest>
-    </jar>
-    <jar 
-        jarfile="${dist}/${depjar}" 
-        basedir="${bin}" 
-        excludes="${unjarred}, org/hamcrest/**, **/*.java, build.xml" 
-        />
-  </target>
-
-  <target name="all.maven.jars" depends="jars,javadoc">
-    <mkdir dir="${dist}" />
-    <jar 
-        jarfile="${dist}/${depsrcjar}"
-        basedir="${src}"
-        excludes="${unjarred}, **/*.class"
-        />
-    <jar 
-        jarfile="${dist}/${depdocjar}"
-        basedir="${javadocdir}"
-        excludes="${unjarred}, org/hamcrest/**"
-        />
-  </target>
-
-  <target name="samples-and-tests">
-    <copy todir="${dist}">
-      <fileset dir="${testbin}" />
-      <fileset dir="${testsrc}" />
-	  <fileset dir="${testrsrc}" />
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           encoding="ISO-8859-1"
+           nowarn="true"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           release="8"
+           target="1.8"
+           verbose="false"
+           fork="true"
+           memoryInitialSize="128m"
+           source="1.8">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
     </copy>
   </target>
 
-  <target name="javadoc">
-    <javadoc destdir="${javadocdir}"
-             source="${compiler.source}"
-             author="false"
-             version="false"
-             use="false"
-             windowtitle="JUnit API"
-             >
-      <excludepackage name="junit.*" />
-      <excludepackage name="org.junit.internal.*" />
-      <excludepackage name="org.junit.experimental.theories.internal.*" />
-      
-      <sourcepath location="${src}" />
-      <sourcepath location="${hamcrestsrc}" />
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="1.8"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             charset="ISO-8859-1"
+             linksource="false"
+             breakiterator="false">
+      <classpath refid="build.classpath"/>
     </javadoc>
   </target>
 
-  <target name="javadoczip">
-    <delete file="${javadoczip}" />
-    <antcall target="javadoc" />
-    <zip basedir="${javadocdir}" file="${javadoczip}" />
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
+         excludes="**/package.html">
+      <manifest>
+		<attribute name="Automatic-Module-Name" value="junit"/>
+		<attribute name="Implementation-Title" value="JUnit"/>
+		<attribute name="Implementation-Vendor" value="JUnit"/>
+		<attribute name="Implementation-Version" value="4.13.2"/>
+      </manifest>
+    </jar>
   </target>
 
-  <target name="populate-dist" 
-          depends="clean, build, jars, samples-and-tests, javadoc"
-          >
-    <copy todir="${dist}/doc">
-      <fileset dir="doc"/>
-    </copy>
-    <copy file="README.md" tofile="${dist}/README.md" />
-    <copy file="BUILDING" tofile="${dist}/BUILDING" />
-    <copy file="epl-v10.html" tofile="${dist}/epl-v10.html" />
-    <copy file="build.xml" tofile="${dist}/build.xml" />
-  </target>
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
 
-  <macrodef name="run-dist-tests">
-    <!-- Runs the tests against the built jar files -->
-    <element name="extra-args" implicit="yes" />
-    <sequential>
-      <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
-        <extra-args />  
-        <arg value="org.junit.tests.AllTests"/>
-        <classpath>
-          <pathelement location="${dist}" />
-          <pathelement location="${dist}/${binjar}" />
-        </classpath>
-      </java>    
-    </sequential>
-  </macrodef>
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
 
-  <macrodef name="run-local-tests">
-    <!-- Runs the tests against the local class files -->
-    <sequential>
-      <java classname="org.junit.runner.JUnitCore" fork="yes" failonerror="true">
-        <arg value="org.junit.tests.AllTests"/>
-        <classpath>
-          <pathelement location="${bin}" />
-          <pathelement location="${testbin}" />
-          <pathelement location="${hamcrestlib}" />
-        </classpath>
-      </java>    
-    </sequential>
-  </macrodef>
-
-  <target name="test" depends="build">
-    <run-local-tests />
-  </target>
-
-  <target name="dist" depends="populate-dist">
-    <run-dist-tests>
-      <jvmarg value="-Dignore.this=ignored"/>
-    </run-dist-tests>
-  </target>
-
-  <target name="profile" depends="populate-dist">
-    <run-dist-tests>
-      <jvmarg value="-agentlib:hprof=cpu=samples"/>
-    </run-dist-tests>
-  </target>
-
-  <target name="zip" depends="dist">
-    <zip zipfile="${zipfile}" basedir="." includes="${dist}/**" />
-  </target>
-
-  <target name="upload.to.sourceforge" depends="zip">
-    <ftp server="upload.sourceforge.net"
-         userid="anonymous"
-         password="saff@mit.edu"
-         remotedir="incoming"
-         >
-      <fileset dir="${dist}" includes="*.jar" />
-      <fileset file="${zipfile}" />
-    </ftp>
-    <echo message="To upload docs, use build/upload_docs.sh" />
-  </target>
-
-  <!-- to do automatic build upload, you need the maven ant tasks jar. -->
-  <!-- therefore, you must run ant as ant -lib build/lib stage.maven -->
-  <macrodef name="push.maven.artifact">
-    <attribute name="file" />
-    <attribute name="pom" />
-    <attribute name="packaging" />
-    <attribute name="url" />
-    <attribute name="repo.id" />
-    <element name="artifact.args" implicit="true" optional="true" />
-    <sequential>
-      <artifact:mvn failonerror="true">
-        <arg value="${maven.deploy.goal}" />
-        <arg value="-Durl=@{url}" />
-        <arg value="-DrepositoryId=@{repo.id}" />
-        <arg value="-DpomFile=@{pom}" />
-        <arg value="-Dfile=@{file}" />
-        <arg value="-Dpackaging=@{packaging}" />
-        <artifact.args />
-        <arg value="-Pgpg" />
-      </artifact:mvn>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="push.maven.jar">
-    <attribute name="jar" />
-    <attribute name="pom" />
-    <attribute name="url" />
-    <attribute name="repo.id" />
-    <element name="artifact.args" implicit="true" optional="true" />
-    <sequential>
-      <echo message="Pushing JAR to Maven: @{jar} -> @{url}" />
-      <push.maven.artifact file="@{jar}" pom="@{pom}" packaging="jar"
-                           url="@{url}" repo.id="@{repo.id}">
-      	<artifact.args />
-      </push.maven.artifact>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="push.maven.pom">
-    <attribute name="pom" />
-    <attribute name="url" />
-    <attribute name="repo.id" />
-    <element name="artifact.args" implicit="true" optional="true" />
-    <sequential>
-      <echo message="Pushing POM to Maven: @{pom} -> @{url}" />
-      <push.maven.artifact file="@{pom}" pom="@{pom}" packaging="pom"
-                           url="@{url}" repo.id="@{repo.id}">
-      	<artifact.args />
-      </push.maven.artifact>
-    </sequential>
-  </macrodef>
-	
-  <macrodef name="push.junit.maven.artifact">
-    <attribute name="url" />
-    <attribute name="repo.id" />
-    <attribute name="is.snapshot" default="true" />
-    <sequential>
-      <local name="m.prefix" />
-      <property name="m.prefix" value="${dist}/junit-dep-${version}" />
-      <local name="m.jar" />
-      <property name="m.jar" value="${m.prefix}.jar" />
-      <local name="m.sources.jar" />
-      <property name="m.sources.jar" value="${m.prefix}-src.jar" />
-      <local name="m.javadoc.jar" />
-      <property name="m.javadoc.jar" value="${m.prefix}-javadoc.jar" />
-      <local name="m.pom" />
-      <property name="m.pom" value="${dist}/pom-junit.xml" />
-
-      <filter token="version" value="${version}" />
-      <copy 
-          file="build/maven/junit-pom-template.xml" 
-          tofile="${m.pom}" 
-          filtering="on"
-          overwrite="true"
-          />
-
-      <push.maven.jar jar="${m.jar}" pom="${m.pom}" 
-                      url="@{url}" repo.id="@{repo.id}" />
-      
-      <if>
-        <equals arg1="@{is.snapshot}" arg2="false" />
-        <then>
-          <push.maven.jar jar="${m.sources.jar}" pom="${m.pom}"
-                          url="@{url}" repo.id="@{repo.id}">
-            <arg value="-Dclassifier=sources" />
-          </push.maven.jar>
-          <push.maven.jar jar="${m.javadoc.jar}" pom="${m.pom}"
-                          url="@{url}" repo.id="@{repo.id}">
-            <arg value="-Dclassifier=javadoc" />
-          </push.maven.jar>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="push.junit-dep.maven.artifact">
-    <attribute name="url" />
-    <attribute name="repo.id" />
-    <sequential>
-      <local name="m.pom" />
-      <property name="m.pom" value="${dist}/pom-junit-dep.xml" />
-
-      <filter token="version" value="${version}" />
-      <copy 
-          file="build/maven/junit-dep-pom-template.xml" 
-          tofile="${m.pom}" 
-          filtering="on"
-          overwrite="true"
-          />
-
-      <push.maven.pom pom="${m.pom}" 
-                      url="@{url}" repo.id="@{repo.id}" />
-    </sequential>
-  </macrodef>
-
-  <target name="stage.maven" depends="all.maven.jars">
-    <property name="stage.url" 
-              value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
-    <property name="stage.repo.id" value="sonatype-nexus-staging" />
-    
-    <push.junit.maven.artifact url="${stage.url}"
-                               repo.id="${stage.repo.id}" 
-                               is.snapshot="false" />
-    <push.junit-dep.maven.artifact url="${stage.url}"
-                                   repo.id="${stage.repo.id}" />
-  </target>
-
-  <target name="snapshot.maven" depends="all.maven.jars">
-    <property name="snapshot.url" 
-              value="https://oss.sonatype.org/content/repositories/snapshots/" />
-    <property name="snapshot.repo.id" value="sonatype-nexus-snapshots" />
-    
-    <push.junit.maven.artifact url="${snapshot.url}"
-                               repo.id="${snapshot.repo.id}" />
-    <push.junit-dep.maven.artifact url="${snapshot.url}"
-                                   repo.id="${snapshot.repo.id}" />
-  </target>
-
-  <target name="print.version">
-    <echo message="${version}" />
-  </target>
 </project>
diff --git a/junit-4.13.2.tar.xz b/junit-4.13.2.tar.xz
new file mode 100644
index 0000000..c5f0d20
--- /dev/null
+++ b/junit-4.13.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e648f34b5103309b87a80c5cfa6342125f827a38858305e3dcab2bf7118f589d
+size 850372
diff --git a/junit.spec b/junit.spec
index e50a485..53aa817 100644
--- a/junit.spec
+++ b/junit.spec
@@ -23,7 +23,7 @@ Summary:        Java regression test package
 License:        EPL-1.0
 Group:          Development/Libraries/Java
 URL:            https://junit.org/junit4/
-Source0:        https://github.com/junit-team/junit4/archive/r%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        build.xml
 Patch0:         0001-Port-to-hamcrest-2.2.patch
 BuildRequires:  ant
@@ -62,7 +62,7 @@ Obsoletes:      %{name}4-manual < %{version}-%{release}
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{name}4-r%{version}
+%setup -q
 %if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0}
 %patch -P 0 -p1
 %endif
@@ -77,13 +77,13 @@ ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar
 %endif
 
 %build
-export CLASSPATH=$(build-classpath hamcrest)
-ant jars javadoc -Dversion-status=
+build-jar-repository -s lib hamcrest
+ant jar javadoc
 
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # compat symlink
 ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar
 
@@ -94,7 +94,7 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr %{name}%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %check
diff --git a/r4.13.2.tar.gz b/r4.13.2.tar.gz
deleted file mode 100644
index 44d85c7..0000000
--- a/r4.13.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b6d700fc374c82951d247f6d80238951d87c61661ceb151f9fbf40f65413561
-size 1077147