diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 0f6e2b9..5f16e7d 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -73,16 +73,6 @@ Javadoc for %{name}. sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %build -%if %with maven -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p ${MAVEN_REPO_LOCAL} -export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dproject.build.directory=$(pwd)/target" -%{_bindir}/mvn-jpp \ - -e \ - -s $(pwd)/settings.xml \ - install javadoc:javadoc -%else - export CLASSPATH=$(build-classpath junit) ant -Dbuild.sysclasspath=first \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ @@ -96,18 +86,13 @@ ant -Dbuild.sysclasspath=first \ -Dcomponent.version=%{version} \ -Dfinal.name=%{name}-%{version} \ -Dextension.name=%{short_name} \ - test jar javadoc -%endif + jar javadoc %install # jars mkdir -p %{buildroot}%{_javadir} -%if %with maven -cp -p target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%else jar umf %{SOURCE4} dist/%{name}-%{version}.jar cp -p dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -%endif ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar