diff --git a/.gitignore b/.gitignore index 8c4d20d..1951b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /jboss-logging-tools-1.0.0.CR4.tar.xz /jboss-logging-tools-1.0.0.Final.tar.xz /jboss-logging-tools-1.0.2.Final.tar.xz +/jboss-logging-tools-1.1.0.Final.tar.xz diff --git a/jboss-logging-tools.spec b/jboss-logging-tools.spec index 80e3fc1..f5e768c 100644 --- a/jboss-logging-tools.spec +++ b/jboss-logging-tools.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-logging-tools -Version: 1.0.2 +Version: 1.1.0 Release: 1%{?dist} Summary: JBoss Logging I18n Annotation Processor Group: Development/Libraries @@ -10,36 +10,22 @@ License: LGPLv2+ URL: https://github.com/jboss-logging/jboss-logging-tools # git clone git://github.com/jboss-logging/jboss-logging-tools.git -# cd jboss-logging-tools && git archive --format=tar --prefix=jboss-logging-tools-1.0.2.Final/ 1.0.2.Final | xz > jboss-logging-tools-1.0.2.Final.tar.xz +# cd jboss-logging-tools && git archive --format=tar --prefix=jboss-logging-tools-1.1.0.Final/ 1.1.0.Final | xz > jboss-logging-tools-1.1.0.Final.tar.xz Source0: jboss-logging-tools-%{namedversion}.tar.xz BuildArch: noarch -BuildRequires: jpackage-utils -BuildRequires: java-devel BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-checkstyle-plugin -BuildRequires: maven-plugin-cobertura -BuildRequires: maven-dependency-plugin -BuildRequires: maven-ear-plugin -BuildRequires: maven-eclipse-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-testng BuildRequires: testng +BuildRequires: maven-surefire-provider-testng BuildRequires: jboss-parent BuildRequires: jboss-logging BuildRequires: jboss-logmanager +BuildRequires: jdeparser Requires: jboss-logging -Requires: jpackage-utils Requires: java +Requires: jdeparser %description This pacakge contains JBoss Logging I18n Annotation Processor @@ -56,33 +42,21 @@ This package contains the API documentation for %{name}. %setup -q -n jboss-logging-tools-%{namedversion} %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install -# JAR -install -pm 644 target/jboss-logging-processor-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss-logging-processor.jar +%files -f .mfiles +%dir %{_javadir}/%{name} -# POM -install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jboss-logging-processor.pom - -%add_maven_depmap JPP-jboss-logging-processor.pom jboss-logging-processor.jar - -# APIDOCS -cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%files -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%{_javadir}/* - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Wed May 29 2013 Marek Goldmann - 1.1.0-1 +- Upstream release 1.1.0.Final +- Using new guidelines + * Fri Feb 22 2013 Marek Goldmann - 1.0.2-1 - Upstream release 1.0.2.Final diff --git a/sources b/sources index 4fa3441..f538dd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56e9194a9b5c093f75aa23a72b65fa80 jboss-logging-tools-1.0.2.Final.tar.xz +7dca9e5ce04fa0be327c09c75cdf9b05 jboss-logging-tools-1.1.0.Final.tar.xz