[concurrentlinkedhashmap-lru] update to 1.4.2

[gil]

commit 4b099832c1bdafd039b226bbd933472e23ef0696
Author: gil <puntogil at libero.it>
Date:   Fri Mar 13 16:36:22 2015 +0100

    update to 1.4.2

 .gitignore                       |   1 +
 LICENSE-2.0.txt                  | 202 ---------------------------------------
 concurrentlinkedhashmap-lru.spec |  63 +++++-------
 sources                          |   2 +-
 4 files changed, 28 insertions(+), 240 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26d5c57..e728942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /concurrentlinkedhashmap-lru-1.3.2-src-git.tar.gz
+/concurrentlinkedhashmap-lru-1.4.2.tar.gz
diff --git a/concurrentlinkedhashmap-lru.spec b/concurrentlinkedhashmap-lru.spec
index 5d90f45..7eec57d 100644
--- a/concurrentlinkedhashmap-lru.spec
+++ b/concurrentlinkedhashmap-lru.spec
@@ -1,47 +1,34 @@
 Name:          concurrentlinkedhashmap-lru
-Version:       1.3.2
-Release:       6%{?dist}
+Version:       1.4.2
+Release:       1%{?dist}
 Summary:       A ConcurrentLinkedHashMap for Java
 License:       ASL 2.0
-Url:           http://code.google.com/p/concurrentlinkedhashmap/
-# git clone https://code.google.com/p/concurrentlinkedhashmap/ concurrentlinkedhashmap-lru-1.3.2
-# (cd concurrentlinkedhashmap-lru-1.3.2 && git checkout concurrentlinkedhashmap-lru-1.3.2)
-# find concurrentlinkedhashmap-lru-1.3.2 -name "*.class" -delete
-# find concurrentlinkedhashmap-lru-1.3.2 -name "*.jar" -type f -delete
-# lib/cache-benchmark/benchmark-fwk.jar
-# rm -rf concurrentlinkedhashmap-lru-1.3.2/.git
-# tar czf concurrentlinkedhashmap-lru-1.3.2-src-git.tar.gz concurrentlinkedhashmap-lru-1.3.2
-Source0:       %{name}-%{version}-src-git.tar.gz
-# concurrentlinkedhashmap-lru package don't include the license file
-Source1:       http://www.apache.org/licenses/LICENSE-2.0.txt
-
-BuildRequires: sonatype-oss-parent
+Url:           https://github.com/ben-manes/concurrentlinkedhashmap
+Source0:       https://github.com/ben-manes/concurrentlinkedhashmap/archive/%{name}-%{version}.tar.gz
 
 # test deps
 %if 0
-BuildRequires: apache-commons-lang
-BuildRequires: ehcache-core
-BuildRequires: ehcache-parent
-BuildRequires: guava
-BuildRequires: mockito
-BuildRequires: testng
+BuildRequires: mvn(com.github.stephenc.high-scale-lib:high-scale-lib)
+BuildRequires: mvn(com.google.guava:guava)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(net.sf.ehcache:ehcache)
 BuildRequires: mvn(org.hamcrest:hamcrest-library) >= 1.3
+BuildRequires: mvn(org.mockito:mockito-all)
+BuildRequires: mvn(org.testng:testng)
 # unavailable test deps
-# require cache-benchmark == r7903 from http://sourceforge.net/projects/cachebenchfwk/
-BuildRequires: mvn(org.cachebench:cache-benchmark)
 BuildRequires: mvn(com.google.caliper:caliper)
-BuildRequires: mvn(com.github.stephenc.high-scale-lib:high-scale-lib)
 BuildRequires: mvn(com.jayway.awaitility:awaitility)
+# require cache-benchmark == r7903 from http://sourceforge.net/projects/cachebenchfwk/
+BuildRequires: mvn(org.cachebench:cache-benchmark)
 %endif
-# com.google.code.findbugs:jsr305:2.0.1 scope: provided
-BuildRequires: jsr-305
 
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-site-plugin
-#BuildRequires: animal-sniffer
-#BuildRequires: mojo-signatures
+
+BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: mvn(com.google.code.findbugs:jsr305)
 
 BuildArch:     noarch
 
@@ -56,7 +43,9 @@ Summary:       Javadoc for %{name}
 This package contains javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -q -n concurrentlinkedhashmap-%{name}-%{version}
+find . -name "*.class" -delete
+find . -name "*.jar" -type f -print -delete
 
 # Unavailable
 %pom_remove_plugin :findbugs-maven-plugin
@@ -73,19 +62,16 @@ This package contains javadoc for %{name}.
 
 # Fix http://jira.codehaus.org/browse/MCOMPILER-130
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:compilerArgument"
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
-<compilerArgument>-Werror</compilerArgument>"
+#%% pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
+#<compilerArgument>-Werror</compilerArgument>"
 %pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration" "
 <compilerArgument>-Xlint:all</compilerArgument>"
 
 # Fix mojo-signatures aId
-sed -i "s|jdk.version}-sun</artifactId>|jdk.version}</artifactId>|" pom.xml
+#sed -i "s|jdk.version}-sun</artifactId>|jdk.version}</artifactId>|" pom.xml
 # Disabled currently is broken
 %pom_remove_plugin :animal-sniffer-maven-plugin
 
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
-
 %mvn_file :%{name} %{name}
 
 %build
@@ -98,12 +84,15 @@ sed -i 's/\r//' LICENSE-2.0.txt
 
 %files -f .mfiles
 %doc README
-%license LICENSE-2.0.txt
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE-2.0.txt
+%license LICENSE NOTICE
 
 %changelog
+* Fri Mar 13 2015 gil cattaneo <puntogil at libero.it> 1.4.2-1
+- update to 1.4.2
+
 * Fri Jan 30 2015 gil cattaneo <puntogil at libero.it> 1.3.2-6
 - introduce license macro
 
diff --git a/sources b/sources
index 7548be5..c18baee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63398b3e7ada46cd89a92c4b771686aa  concurrentlinkedhashmap-lru-1.3.2-src-git.tar.gz
+aba5e53e9b5495f5a4eb10de9c7f8e62  concurrentlinkedhashmap-lru-1.4.2.tar.gz