OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=95

ant-antlr.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
+
+- Don't condition the maven defines on release version, but on 
+  _maven_repository being defined
+
 -------------------------------------------------------------------
 Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
 

ant-antlr.spec

@@ -579,10 +579,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 #%{_mavenpomdir}/JPP-ant-launcher.pom
 #%{_mavenpomdir}/JPP-ant-parent.pom
 #%{_mavenpomdir}/JPP-ant.pom
-#%if %{?suse_version} > 1320
+#%if %{defined _maven_repository}
-#%{_datadir}/maven-metadata/ant.xml
-#%else
 #%config(noreplace) %{_mavendepmapfragdir}/ant
+#%else
+#%{_datadir}/maven-metadata/ant.xml
 #%endif
 #%dir %{_mavenpomdir}
 
@@ -594,10 +594,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-antlr.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %{_mavenpomdir}/JPP.ant-ant-antlr.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-antlr.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
+%else
+%{_datadir}/maven-metadata/ant-antlr.xml
 %endif
 %dir %{_mavenpomdir}
 %endif
@@ -612,10 +612,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 %{_mavenpomdir}/JPP.ant-ant-junit*.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-junit.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-junit
+%else
+%{_datadir}/maven-metadata/ant-junit.xml
 %endif
 %dir %{_mavenpomdir}
 %endif

ant-junit.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
+
+- Don't condition the maven defines on release version, but on 
+  _maven_repository being defined
+
 -------------------------------------------------------------------
 Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
 

ant-junit.spec

@@ -579,10 +579,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 #%{_mavenpomdir}/JPP-ant-launcher.pom
 #%{_mavenpomdir}/JPP-ant-parent.pom
 #%{_mavenpomdir}/JPP-ant.pom
-#%if %{?suse_version} > 1320
+#%if %{defined _maven_repository}
-#%{_datadir}/maven-metadata/ant.xml
-#%else
 #%config(noreplace) %{_mavendepmapfragdir}/ant
+#%else
+#%{_datadir}/maven-metadata/ant.xml
 #%endif
 #%dir %{_mavenpomdir}
 
@@ -594,10 +594,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-antlr.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %{_mavenpomdir}/JPP.ant-ant-antlr.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-antlr.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
+%else
+%{_datadir}/maven-metadata/ant-antlr.xml
 %endif
 %dir %{_mavenpomdir}
 %endif
@@ -612,10 +612,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 %{_mavenpomdir}/JPP.ant-ant-junit*.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-junit.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-junit
+%else
+%{_datadir}/maven-metadata/ant-junit.xml
 %endif
 %dir %{_mavenpomdir}
 %endif

ant.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 29 07:06:59 UTC 2017 - fstrba@suse.com
+
+- Don't condition the maven defines on release version, but on 
+  _maven_repository being defined
+
 -------------------------------------------------------------------
 Thu Sep 14 05:39:48 UTC 2017 - fstrba@suse.com
 

ant.spec

@@ -578,10 +578,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 #%{_mavenpomdir}/JPP-ant-launcher.pom
 #%{_mavenpomdir}/JPP-ant-parent.pom
 #%{_mavenpomdir}/JPP-ant.pom
-#%if %{?suse_version} > 1320
+#%if %{defined _maven_repository}
-#%{_datadir}/maven-metadata/ant.xml
-#%else
 #%config(noreplace) %{_mavendepmapfragdir}/ant
+#%else
+#%{_datadir}/maven-metadata/ant.xml
 #%endif
 #%dir %{_mavenpomdir}
 
@@ -593,10 +593,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/lib/ant-antlr.jar
 %config(noreplace) %{_sysconfdir}/ant.d/antlr
 %{_mavenpomdir}/JPP.ant-ant-antlr.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-antlr.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-antlr
+%else
+%{_datadir}/maven-metadata/ant-antlr.xml
 %endif
 %dir %{_mavenpomdir}
 %endif
@@ -611,10 +611,10 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 %{_mavenpomdir}/JPP.ant-ant-junit*.pom
-%if %{?suse_version} > 1320
+%if %{defined _maven_repository}
-%{_datadir}/maven-metadata/ant-junit.xml
-%else
 %config(noreplace) %{_mavendepmapfragdir}/ant-junit
+%else
+%{_datadir}/maven-metadata/ant-junit.xml
 %endif
 %dir %{_mavenpomdir}
 %endif