Fridrich Strba 2017-09-29 07:07:36 +00:00 committed by Git OBS Bridge
parent b6a06f3258
commit c422bb5701
6 changed files with 45 additions and 27 deletions

View File

@ -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

View File

@ -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
#%{_datadir}/maven-metadata/ant.xml
#%else
#%if %{defined _maven_repository}
#%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
%{_datadir}/maven-metadata/ant-antlr.xml
%else
%if %{defined _maven_repository}
%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
%{_datadir}/maven-metadata/ant-junit.xml
%else
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%else
%{_datadir}/maven-metadata/ant-junit.xml
%endif
%dir %{_mavenpomdir}
%endif

View File

@ -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

View File

@ -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
#%{_datadir}/maven-metadata/ant.xml
#%else
#%if %{defined _maven_repository}
#%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
%{_datadir}/maven-metadata/ant-antlr.xml
%else
%if %{defined _maven_repository}
%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
%{_datadir}/maven-metadata/ant-junit.xml
%else
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%else
%{_datadir}/maven-metadata/ant-junit.xml
%endif
%dir %{_mavenpomdir}
%endif

View File

@ -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

View File

@ -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
#%{_datadir}/maven-metadata/ant.xml
#%else
#%if %{defined _maven_repository}
#%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
%{_datadir}/maven-metadata/ant-antlr.xml
%else
%if %{defined _maven_repository}
%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
%{_datadir}/maven-metadata/ant-junit.xml
%else
%if %{defined _maven_repository}
%config(noreplace) %{_mavendepmapfragdir}/ant-junit
%else
%{_datadir}/maven-metadata/ant-junit.xml
%endif
%dir %{_mavenpomdir}
%endif