[jboss-reflect] Update to new pom_* macros to fix FTBFS
Gerard Ryan
galileo at fedoraproject.org
Wed Jul 2 19:43:44 UTC 2014
commit b3a4dabc5fa398deb48f0e698d8f845500250e73
Author: Gerard Ryan <gerard at ryan.lt>
Date: Wed Jul 2 20:33:04 2014 +0100
Update to new pom_* macros to fix FTBFS
jboss-reflect-pom.patch | 186 -----------------------------------------------
jboss-reflect.spec | 42 ++++-------
2 files changed, 14 insertions(+), 214 deletions(-)
---
diff --git a/jboss-reflect.spec b/jboss-reflect.spec
index 3fe2ef3..fa42268 100644
--- a/jboss-reflect.spec
+++ b/jboss-reflect.spec
@@ -1,6 +1,6 @@
Name: jboss-reflect
Version: 2.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: JBoss Reflection
Group: Development/Libraries
@@ -11,7 +11,6 @@ URL: http://www.jboss.org
# svn export http://anonsvn.jboss.org/repos/jbossas/projects/jboss-reflect/tags/2.0.2.GA/ jboss-reflect-2.0.2
# tar cJf jboss-reflect-2.0.2.tar.xz jboss-reflect-2.0.2
Source0: %{name}-%{version}.tar.xz
-Patch0: %{name}-pom.patch
BuildArch: noarch
@@ -28,12 +27,7 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-
-Requires: javassist
-Requires: jboss-common-core
-Requires: jboss-logging
-Requires: jpackage-utils
+BuildRequires: maven-surefire-provider-junit
%description
JBoss Reflection
@@ -55,35 +49,27 @@ rm -rf src/test
find -type f -name *.jar -delete
find -type f -name *.class -delete
-%patch0
+%pom_remove_dep org.jboss.test:jboss-test
+%pom_remove_dep jboss.profiler.jvmti:jboss-profiler-jvmti
+
+%pom_remove_dep org.jboss.logging:jboss-logging-spi
+%pom_add_dep org.jboss.logging:jboss-logging
%build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
%install
+%mvn_install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%files -f .mfiles
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%changelog
+* Wed Jul 02 2014 Gerard Ryan <galileo at fedoraproject.org> - 2.0.2-8
+- Update to new pom_* macros
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list