OBS-URL: https://build.opensuse.org/package/show/Java:packages/jakarta-commons-modeler?expand=0&rev=17

jakarta-commons-modeler.spec

@@ -66,8 +66,14 @@ Modeler Package.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
+# convert DOS lineenedings to unix
+sed -i 's/\r$//' NOTICE.txt
+sed -i 's/\r$//' RELEASE-NOTES.txt
+sed -i 's/\r$//' xdocs/*.xml
+sed -i 's/\r$//' xdocs/style/*.css
+
 %build
-ant \
+%{ant} \
     -Dant.jar=$(build-classpath ant) \
     -Djaxp.parser.jar=$(build-classpath xerces-j2) \
     -Djaxp.xalan.jar=$(build-classpath xalan-j2) \
@@ -79,25 +85,22 @@ ant \
     dist
 
 %install
-# jars
+
+# jar
 install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
 %{mvn_install_pom} %{SOURCE10} %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
+
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-# convert DOS lineenedings to unix
-sed -i 's/\r$//' NOTICE.txt
-sed -i 's/\r$//' RELEASE-NOTES.txt
-sed -i 's/\r$//' xdocs/*.xml
-sed -i 's/\r$//' xdocs/style/*.css
-
 %files -f .mfiles
 %doc NOTICE.txt RELEASE-NOTES.txt xdocs
 %license LICENSE.txt