[java-sig-commits] [jdependency] Update to version 0.7 and to the latest guidelines
Pierre-YvesChibon
pingou at fedoraproject.org
Tue Dec 13 16:44:25 UTC 2011
commit cab72690bf8a0b141f6c8a97350e216cb6451166
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date: Tue Dec 13 17:13:20 2011 +0100
Update to version 0.7 and to the latest guidelines
jdependency.spec | 71 ++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 44 deletions(-)
---
diff --git a/jdependency.spec b/jdependency.spec
index ec21981..f0ed25b 100644
--- a/jdependency.spec
+++ b/jdependency.spec
@@ -1,37 +1,39 @@
+%global githash g0d9d058
+
Name: jdependency
-Version: 0.6
-Release: 4%{?dist}
+Version: 0.7
+Release: 1%{?dist}
Summary: This project provides an API to analyse class dependencies
Group: Development/Libraries
License: ASL 2.0
URL: http://github.com/tcurdt/jdependency
-# wget http://github.com/tcurdt/jdependency/tarball/jdependency-0.6
-Source0: tcurdt-jdependency-jdependency-0.6-0-g165c94a.tar.gz
+# wget http://github.com/tcurdt/jdependency/tarball/jdependency-0.7
+Source0: tcurdt-jdependency-jdependency-%{version}-0-%{githash}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: maven2
-BuildRequires: maven2-common-poms
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven2-plugin-idea
-
-BuildRequires: jpackage-utils
+BuildRequires: maven
+BuildRequires: maven-common-poms
+BuildRequires: maven-plugin-compiler
+BuildRequires: maven-plugin-install
+BuildRequires: maven-plugin-jar
+BuildRequires: maven-plugin-javadoc
+BuildRequires: maven-plugin-resources
+BuildRequires: maven-plugin-surefire
+BuildRequires: maven-plugin-idea
+
+BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: objectweb-asm
BuildRequires: apache-commons-io
Requires: objectweb-asm >= 3.2
Requires: apache-commons-io
-Requires: java
+Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
%description
@@ -48,14 +50,10 @@ Requires: jpackage-utils
%prep
-%setup -q -n tcurdt-jdependency-ae4617e
+%setup -q -n tcurdt-jdependency-%{githash}
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
install javadoc:javadoc
%install
@@ -63,34 +61,20 @@ rm -rf %{buildroot}
# Jar
mkdir -p %{buildroot}%{_javadir}
-install -Dpm 644 target/%{name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-pushd %{buildroot}%{_javadir}/
-ln -s %{name}-%{version}.jar %{name}.jar
-popd
+install -Dpm 644 target/%{name}.jar \
+ %{buildroot}%{_javadir}/%{name}.jar
-# create a symbolic link without the version
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# Javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site/api*
# poms
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-jdependency.pom
-%add_to_maven_depmap org.vafer %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.jar %{name}.jar
%clean
rm -rf %{buildroot}
@@ -104,7 +88,6 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%doc LICENSE.txt
More information about the java-sig-commits
mailing list