commit c0afb580870b7af2db4f9201fd5b72fef98d06c7
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 09:40:10 2015 +0100
introduce license macro
gentlyweb-utils.spec | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/gentlyweb-utils.spec b/gentlyweb-utils.spec
index 89c6119..50a8207 100644
--- a/gentlyweb-utils.spec
+++ b/gentlyweb-utils.spec
@@ -3,11 +3,10 @@ Name: gentlyweb-utils
#
http://ftp.de.debian.org/debian/pool/main/g/gentlyweb-utils/gentlyweb-uti...
# the version is changed only in the activemq package see activemq-5.6.0/pom.xml
Version: 1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Java utility library used by JoSQL for I/O
License: ASL 2.0
Url:
http://josql.sourceforge.net/
-#Sour ce0:
http://gentlyweb-utils.sourcearchive.com/downloads/1.5-1/gentlyweb-utils_...
Source0:
http://sourceforge.net/projects/josql/files/josql/stable-2.2/gentlyWEB-sr...
Source1:
http://repo.fusesource.com/nexus/content/groups/public/net/sf/josql/%{nam...
# use system libraries
@@ -16,14 +15,10 @@ Source1:
http://repo.fusesource.com/nexus/content/groups/public/net/sf/jos
# add javadoc task
Patch0: %{name}-%{version}-build.patch
-
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
BuildRequires: ant
+BuildRequires: javapackages-local
BuildRequires: jdom
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -39,33 +34,27 @@ This package contains javadoc for %{name}.
%setup -q -n gentlyWEB-src-utils-1.1
%patch0 -p0
+%mvn_file : %{name} gentlyWEB-utils
+
%build
%ant -f build-utils.xml createUtilsJar javadoc
%install
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 gentlyWEB-utils-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/gentlyWEB-utils.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %SOURCE1 %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_artifact %{SOURCE1} gentlyWEB-utils-%{version}.jar
+%mvn_install -J apidocs
%files -f .mfiles
-%{_javadir}/gentlyWEB-utils.jar
-%doc LICENSE-2.0.txt
+%license LICENSE-2.0.txt
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE-2.0.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE-2.0.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 1.5-7
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.5-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild