[jgrapht/f20] Add maven metadata

gil gil at fedoraproject.org
Tue Mar 10 15:18:09 UTC 2015


commit 07c74d11cab5fb595cb99f7546d8d0b198615539
Author: gil <puntogil at libero.it>
Date:   Tue Mar 10 16:18:03 2015 +0100

    Add maven metadata

 jgrapht.spec | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)
---
diff --git a/jgrapht.spec b/jgrapht.spec
index 07a2219..b089a85 100644
--- a/jgrapht.spec
+++ b/jgrapht.spec
@@ -1,19 +1,16 @@
 Name:    jgrapht
 Version: 0.8.1
-Release: 7%{?dist}
+Release: 9%{?dist}
 Summary: A free Java graph library that provides mathematical graph objs and algorithms
-Group:   Development/Libraries
 License: LGPLv2+
 URL:     http://jgrapht.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/jgrapht/JGraphT/Version%200.8.1/jgrapht-%{version}.tar.gz
 Patch0:  remove_uneccessary_hardcoded_classpath.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: java-devel >= 1.6
 BuildRequires: jpackage-utils
+BuildRequires: maven-local
 BuildRequires: ant
-Requires: java
-Requires: jpackage-utils
 
 BuildArch: noarch
 
@@ -23,9 +20,6 @@ objects and algorithms.
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -47,29 +41,29 @@ ant jar
 ant javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%mvn_artifact thirdparty:%{name}-jdk1.6:%{version} %{name}-jdk1.6.jar
+%mvn_file thirdparty:%{name}-jdk1.6 %{name}
+%mvn_install -J javadoc
 
-cp %{name}-jdk1.6.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%files -f .mfiles
+%doc README.html
+%license license-LGPL.txt
 
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license license-LGPL.txt
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%changelog
+* Tue Mar 10 2015 gil cattaneo <puntogil at libero.it> 0.8.1-9
+- Add maven metadata
+- Adapt to current guideline
 
-%files
-%defattr(-,root,root,-)
-%{_javadir}/%{name}-%{version}.jar
-%{_javadir}/%{name}.jar
-%doc license-LGPL.txt README.html
+* Fri Mar 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.8.1-8
+- Move to java-headless
+- Resolves: rhbz#1068279
 
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+* Fri Mar 21 2014 Michael Simacek <msimacek at redhat.com> - 0.8.1-8
+- Remove version from JAR name
 
-%changelog
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list