diff --git a/.gitignore b/.gitignore index 6ae92c7..dcc347f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jboss-el-api_3.0_spec-1.0.0.Alpha1.tar.gz +/jboss-el-api_3.0_spec-1.0.5.Final.tar.gz diff --git a/jboss-el-3.0-api.spec b/jboss-el-3.0-api.spec index 00f9341..eb75097 100644 --- a/jboss-el-3.0-api.spec +++ b/jboss-el-3.0-api.spec @@ -1,20 +1,19 @@ -%global namedreltag .Alpha1 +%global namedreltag .Final %global namedversion %{version}%{?namedreltag} Name: jboss-el-3.0-api -Version: 1.0.0 -Release: 0.5%{namedreltag}%{dist} +Version: 1.0.5 +Release: 1%{dist} Summary: JSR-341 Expression Language 3.0 API License: (CDDL or GPLv2 with exceptions) and ASL 2.0 -Url: http://www.jboss.org +Url: https://github.com/jboss/jboss-el-api_spec Source0: https://github.com/jboss/jboss-el-api_spec/archive/jboss-el-api_3.0_spec-%{namedversion}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: cddl.txt -BuildRequires: jboss-parent -BuildRequires: felix-osgi-foundation -BuildRequires: felix-parent BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildArch: noarch @@ -22,7 +21,7 @@ BuildArch: noarch The JSR-341 Expression Language 3.0 API classes. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -33,6 +32,8 @@ This package contains the API documentation for %{name}. cp %{SOURCE1} . cp %{SOURCE2} . +%pom_remove_plugin :maven-source-plugin + sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1307,02110-1301," LICENSE %build @@ -42,13 +43,20 @@ sed -i "s,59 Temple Place,51 Franklin Street,;s,Suite 330,Fifth Floor,;s,02111-1 %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} -%doc LICENSE README cddl.txt LICENSE-2.0.txt +%doc README +%license LICENSE cddl.txt LICENSE-2.0.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE README cddl.txt LICENSE-2.0.txt +%license LICENSE cddl.txt LICENSE-2.0.txt %changelog +* Wed Jun 01 2016 gil cattaneo 1.0.5-1 +- update to 1.0.5.Final +- fix BR list and use BR mvn()-like +- introduce license macro +- remove some rpmlint problems +- remove duplicate files + * Thu Feb 04 2016 Fedora Release Engineering - 1.0.0-0.5.Alpha1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 8e2d8ae..599d368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f72f199de219aefc1840aa87733e7ac1 jboss-el-api_3.0_spec-1.0.0.Alpha1.tar.gz +ced99a0b823d7ac0b52d503f724174e1 jboss-el-api_3.0_spec-1.0.5.Final.tar.gz