[struts] disable master pom
gil
gil at fedoraproject.org
Tue Jun 10 14:35:17 UTC 2014
commit c918099f8a71cc260927c7f767e98dd38171dff3
Author: gil <puntogil at libero.it>
Date: Tue Jun 10 16:35:06 2014 +0200
disable master pom
struts.spec | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index ca8042f..8c57c29 100644
--- a/struts.spec
+++ b/struts.spec
@@ -48,7 +48,7 @@ BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
BuildRequires: mvn(oro:oro)
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildArch: noarch
Obsoletes: %{name}-manual < %{version}
@@ -102,7 +102,8 @@ cd src
%mvn_file :%{name}-scripting %{name}/scripting
%mvn_file :%{name}-taglib %{name}/taglib
%mvn_file :%{name}-tiles %{name}/tiles
-
+%pom_remove_parent src
+#cp -p %%{SOURCE1} pom.xml
%build
cd src
@@ -115,13 +116,13 @@ cd src
%mvn_install
)
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-master.pom
-%add_maven_depmap JPP.%{name}-master.pom
+#install -pm 644 pom.xml %%{buildroot}%%{_mavenpomdir}/JPP.%%{name}-master.pom
+#%%add_maven_depmap JPP.%%{name}-master.pom
%files -f src/.mfiles
%dir %{_javadir}/%{name}
-%{_mavenpomdir}/JPP.%{name}-master.pom
-%{_mavendepmapfragdir}/%{name}
+#%%{_mavenpomdir}/JPP.%%{name}-master.pom
+#%%{_mavendepmapfragdir}/%%{name}
%doc LICENSE.txt NOTICE.txt
%files javadoc -f src/.mfiles-javadoc
More information about the scm-commits
mailing list