[jandex] Upstream release 1.1.0.Final
Marek Goldmann
goldmann at fedoraproject.org
Wed Sep 11 13:18:08 UTC 2013
commit af774bee4ee5fdd23fa2c795bd13bf7f30cd4fc0
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Wed Sep 11 15:17:54 2013 +0200
Upstream release 1.1.0.Final
.gitignore | 1 +
jandex.spec | 47 ++++++++++++-----------------------------------
sources | 2 +-
3 files changed, 14 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a86f97c..bbc3dc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/jandex-1.0.0.Final.tar.xz
/jandex-1.0.3.Final.tar.xz
+/1.1.0.Final.tar.gz
diff --git a/jandex.spec b/jandex.spec
index 9183f39..e2efd63 100644
--- a/jandex.spec
+++ b/jandex.spec
@@ -2,23 +2,16 @@
%global namedversion %{version}%{?namedreltag}
Name: jandex
-Version: 1.0.3
-Release: 8%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Java Annotation Indexer
Group: Development/Libraries
License: LGPLv2+
URL: https://github.com/jbossas/jandex
-
-# git clone git://github.com/jbossas/jandex.git
-# cd jandex/ && git archive --format=tar --prefix=jandex-1.0.3.Final/ 1.0.3.Final | xz > jandex-1.0.3.Final.tar.xz
-Source0: %{name}-%{namedversion}.tar.xz
-
-Patch0: 0001-Allow-to-pacakge-the-index-file-into-jar.patch
+Source0: https://github.com/wildfly/jandex/archive/%{namedversion}.tar.gz
BuildArch: noarch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -32,49 +25,33 @@ BuildRequires: maven-enforcer-plugin
BuildRequires: junit4
BuildRequires: jboss-parent
-Requires: jpackage-utils
-Requires: java
-
%description
This package contains Java Annotation Indexer
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{namedversion}
-
-%patch0 -p1
+%setup -q -n jandex-%{namedversion}
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%changelog
+* Wed Sep 11 2013 Marek Goldmann <mgoldman at redhat.com> - 1.1.0-1
+- Upstream release 1.1.0.Final
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 3ca0f7e..83ea0c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e496bea1ca52f2eee592835a7bc986ce jandex-1.0.3.Final.tar.xz
+1e90a2351e861b8daae76556f7d7f7e4 1.1.0.Final.tar.gz
More information about the scm-commits
mailing list