From 0fee0285f7bcbbe108bdbb9313eb7b4191cf854d Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth(a)redhat.com>
Date: Tue, 1 Dec 2015 00:09:04 +0000
Subject: Bring spec up to date to fix FTBFS
---
coro-mock.spec | 42 +++++++++++-------------------------------
1 file changed, 11 insertions(+), 31 deletions(-)
diff --git a/coro-mock.spec b/coro-mock.spec
index 774be0f..635a8e4 100644
--- a/coro-mock.spec
+++ b/coro-mock.spec
@@ -5,26 +5,14 @@
Name: coro-mock
Version: 1.0
-Release: 0.8.%{git}git%{?dist}
+Release: 0.9.%{git}git%{?dist}
Summary: A mock library for compiling JVM coroutine-using code on JVMs without
coroutines
-Group: Development/Libraries
License: Public Domain
Url:
https://github.com/headius/coro-mock
Source0:
https://github.com/headius/%{name}/tarball/%{git}/headius-%{name}-%{git}....
-BuildRequires: forge-parent
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: junit
-
-BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-
-Requires: java-headless
-Requires: jpackage-utils
+BuildRequires: maven-local
+BuildRequires: mvn(junit:junit)
BuildArch: noarch
@@ -33,9 +21,7 @@ A small mock library for compiling JVM coroutine-utilizing code on JVMs
without coroutines.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
@@ -44,28 +30,22 @@ This package contains javadoc for %{name}.
%setup -q -n headius-%{name}-%{git}
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
%files -f .mfiles
-%doc LICENSE
+%license LICENSE
-%files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
%changelog
+* Tue Dec 01 2015 Mat Booth <mat.booth(a)redhat.com> - 1.0-0.9.e55ca83git
+- Bring spec up to date to fix FTBFS
+
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.0-0.8.e55ca83git
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/coro-mock.git/commit/?h=master&id=...