[opensaml-java-parent] Switch to xmvn
Marek Goldmann
goldmann at fedoraproject.org
Wed Jul 2 07:59:40 UTC 2014
commit 5f4e316a945ca20c26655e05b6b3e2d10d8f6211
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Jul 2 09:59:37 2014 +0200
Switch to xmvn
opensaml-java-parent.spec | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/opensaml-java-parent.spec b/opensaml-java-parent.spec
index 56d874f..e5b27a5 100644
--- a/opensaml-java-parent.spec
+++ b/opensaml-java-parent.spec
@@ -1,6 +1,6 @@
Name: opensaml-java-parent
Version: 4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: OpenSAML Java Parent
Group: Development/Libraries
License: ASL 2.0
@@ -19,32 +19,34 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-clean-plugin
BuildRequires: maven-dependency-plugin
-Requires: jpackage-utils
+%if 0%{?fedora} >= 21
+BuildRequires: jcl-over-slf4j
+BuildRequires: jul-to-slf4j
+BuildRequires: log4j-over-slf4j
+%else
+BuildRequires: slf4j
+%endif
%description
This package contains the OpenSAML Java Parent
%prep
+cp %{SOURCE0} pom.xml
cp %{SOURCE1} .
%build
-mvn-rpmbuild -f %{SOURCE0} install javadoc:aggregate
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+%mvn_install
-# POM
-install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
%doc LICENSE-2.0.txt
%changelog
+* Tue Jun 17 2014 Marek Goldmann <mgoldman at redhat.com> - 4-8
+- Switch to xmvn
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list