[time-api] changes for xmvn 2.0
Peter MacKinnon
pmackinn at fedoraproject.org
Tue Jun 10 14:30:03 UTC 2014
commit 785f0186fdcc5045ccaff03d8e37f1fb2b739fbf
Author: Peter MacKinnon <pmackinn at redhat.com>
Date: Tue Jun 10 14:29:33 2014 +0000
changes for xmvn 2.0
time-api.spec | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
---
diff --git a/time-api.spec b/time-api.spec
index 64f2b81..f828ffd 100644
--- a/time-api.spec
+++ b/time-api.spec
@@ -1,7 +1,7 @@
%global oname threeten
Name: time-api
Version: 0.6.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: JSR-310 - Date and Time API
# GPLv2: src-openjdk/main/java/java/util/GregorianCalendar.java
# src-openjdk/main/java/java/util/Calendar.java
@@ -51,35 +51,28 @@ sed -i 's/\r//' COPYRIGHT-ASSIGN.txt LICENSE.txt LICENSE_OpenJDK.txt LICENSE_Ora
%build
-ant jar-all javadoc
+%mvn_build -f
%install
+%mvn_install
+
# https://fedoraproject.org/wiki/Packaging:Java#Packages_providing_APIs
mkdir -p %{buildroot}%{_javadir}/javax.time
-install -m 644 build/%{oname}-all-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/javax.time/
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+ln -sf %{_javadir}/%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.time/
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
+%files -f .mfiles
%{_javadir}/javax.time/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
%doc COPYRIGHT-ASSIGN.txt LICENSE.txt LICENSE_OpenJDK.txt LICENSE_Oracle.txt
%doc OpenJDKChallenge.txt README.txt RELEASE-NOTES.txt TODO.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc COPYRIGHT-ASSIGN.txt LICENSE.txt LICENSE_OpenJDK.txt LICENSE_Oracle.txt
%changelog
+* Tue Jun 10 2014 Pete MacKinnon <pmackinn at redhat.com> 0.6.4-6
+- changes for xmvn 2.0
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -94,4 +87,4 @@ cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
- add fpc notes and virtual provide
* Thu Sep 19 2013 gil cattaneo <puntogil at libero.it> 0.6.4-1
-- initial rpm
\ No newline at end of file
+- initial rpm
More information about the scm-commits
mailing list