diff --git a/.gitignore b/.gitignore index a1c65bf..2d8a75f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /v1.1-alpha.tar.gz +/jctools-1.2.1.tar.gz diff --git a/jctools.spec b/jctools.spec index 1bbf465..7c7da57 100644 --- a/jctools.spec +++ b/jctools.spec @@ -1,13 +1,13 @@ -%global namedreltag -alpha +%global namedreltag %nil %global namedversion %{version}%{?namedreltag} Name: jctools -Version: 1.1 -Release: 0.3.alpha%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Java Concurrency Tools for the JVM License: ASL 2.0 URL: http://jctools.github.io/JCTools/ -Source0: https://github.com/JCTools/JCTools/archive/v%{namedversion}.tar.gz +Source0: https://github.com/JCTools/JCTools/archive/v%{namedversion}/%{name}-%{namedversion}.tar.gz BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -29,53 +29,89 @@ currently missing from the JDK: ° Low contention stats counters ° Executor +%package experimental +Summary: JCTools Experimental implementations + +%description experimental +Experimental implementations for the +Java Concurrency Tools Library. + %package javadoc Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. +%package parent +Summary: JCTools Parent POM + +%description parent +JCTools Parent POM. + %prep %setup -q -n JCTools-%{namedversion} # Cleanup find . -name '*.class' -print -delete find . -name '*.jar' -print -delete +%pom_xpath_set pom:project/pom:version %{namedversion} +%pom_xpath_set -r pom:parent/pom:version %{namedversion} %{name}-core %{name}-experimental + # Prevent build failure %pom_remove_plugin :maven-enforcer-plugin # Unavailable deps -%pom_disable_module jctools-benchmarks +%pom_disable_module %{name}-benchmarks + +# Not available +%pom_remove_plugin :cobertura-maven-plugin %{name}-core + +# Useless tasks +%pom_remove_plugin :maven-source-plugin %{name}-core +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions" %{name}-core # Add OSGi support -%pom_xpath_set "pom:project/pom:packaging" bundle jctools-core -%pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 jctools-core ' -true - - - bundle-manifest - process-classes - - manifest - - -' +for mod in core experimental; do + %pom_xpath_set "pom:project/pom:packaging" bundle %{name}-${mod} + %pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 %{name}-${mod} ' + true + + + bundle-manifest + process-classes + + manifest + + + + + true + ' +done %build -%mvn_build +%mvn_build -s %install %mvn_install -%files -f .mfiles +%files -f .mfiles-%{name}-core %doc README.md %license LICENSE +%files experimental -f .mfiles-%{name}-experimental + %files javadoc -f .mfiles-javadoc %license LICENSE +%files parent -f .mfiles-%{name}-parent +%license LICENSE + %changelog +* Wed Sep 28 2016 gil cattaneo 1.2.1-1 +- update to 1.2.1 + * Thu Feb 04 2016 Fedora Release Engineering - 1.1-0.3.alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 8216c14..65e7b7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59cd87a33fabc03e212eb671c288033b v1.1-alpha.tar.gz +33106b61e7031f5e18e2a943e90dace5 jctools-1.2.1.tar.gz