[spymemcached] update to 2.11.4
gil
gil at fedoraproject.org
Tue Feb 17 07:29:59 UTC 2015
commit 24b1ffa35423d9da9f0066d131f81f35446d3c7a
Author: gil <puntogil at libero.it>
Date: Tue Feb 17 08:29:37 2015 +0100
update to 2.11.4
.gitignore | 1 +
sources | 2 +-
spymemcached-2.9.0-fix-template-pom.patch | 66 ----
spymemcached-2.9.1-build.patch | 474 -----------------------------
spymemcached.spec | 69 ++---
5 files changed, 27 insertions(+), 585 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1480c03..7a4c979 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/2.8.12.tar.gz
/2.9.0.tar.gz
/2.9.1.tar.gz
+/2.11.4.tar.gz
diff --git a/sources b/sources
index 97f8071..39c1a70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-254896cf4d0631c86290417388587e63 2.9.1.tar.gz
+0e6519d494413ba950c76dba0cfb3704 2.11.4.tar.gz
diff --git a/spymemcached.spec b/spymemcached.spec
index ad4608c..179b3c2 100644
--- a/spymemcached.spec
+++ b/spymemcached.spec
@@ -1,40 +1,25 @@
Name: spymemcached
-Version: 2.9.1
-Release: 4%{?dist}
+Version: 2.11.4
+Release: 1%{?dist}
Summary: Java client for memcached
# ASL src/scripts/write-version-info.sh
License: ASL 2.0 and MIT
Url: http://code.google.com/p/spymemcached/
Source0: https://github.com/dustin/java-memcached-client/archive/%{version}.tar.gz
-# disable ivy and maven-ant-tasks support
-# use system libraries
-# disable ivy and maven-ant-tasks support
-# use system libraries
-# disable test: require jmock 1.x
-Patch0: %{name}-2.9.1-build.patch
-# fix pom entries
-Patch1: %{name}-2.9.0-fix-template-pom.patch
-BuildRequires: java-devel
-
-BuildRequires: ant
-BuildRequires: ant-contrib
-BuildRequires: log4j12
-BuildRequires: slf4j
-BuildRequires: springframework-beans
-
-BuildRequires: git
+BuildRequires: maven-local
+BuildRequires: mvn(com.codahale.metrics:metrics-core)
+BuildRequires: mvn(log4j:log4j:1.2.17)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.springframework:spring-beans)
%if 0
# test deps
-BuildRequires: ant-junit
-BuildRequires: jmock >= 1.2.0
-BuildRequires: junit
+BuildRequires: mvn(jmock:jmock) >= 1.2.0
+BuildRequires: mvn(junit:junit)
%endif
-Requires: log4j12
-Requires: slf4j
-Requires: springframework-beans
+Requires: mvn(log4j:log4j:1.2.17)
BuildArch: noarch
@@ -52,40 +37,36 @@ This package contains javadoc for %{name}.
find -name '*.jar' -delete
find -name '*.class' -delete
-%patch0 -p0
-%patch1 -p1
+sed -i "s|2.999.999-SNAPSHOT|%{version}|" pom.xml
+sed -i.log4j12 "s|<version>1.2.16|<version>1.2.17|" pom.xml
-sed -i "s|@VERSION@|%{version}|" build.xml
-sed -i "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
+native2ascii -encoding UTF-8 src/main/java/net/spy/memcached/MemcachedConnection.java \
+ src/main/java/net/spy/memcached/MemcachedConnection.java
-native2ascii -encoding UTF-8 src/test/java/net/spy/memcached/ProtocolBaseCase.java \
- src/test/java/net/spy/memcached/ProtocolBaseCase.java
+# Unavailable test dep
+%pom_remove_dep :jmock
+
+%mvn_file :%{name} %{name}
+%mvn_alias :%{name} spy:spymemcached spy:memcached
%build
-%ant jar docs
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -pm 644 build/jars/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 ivy/pom.template.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "spy:spymemcached,spy:memcached"
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr build/docs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
%files -f .mfiles
%doc README.markdown
%license LICENSE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%license LICENSE.txt
%changelog
+* Tue Feb 17 2015 gil cattaneo <puntogil at libero.it> 2.11.4-1
+- update to 2.11.4
+
* Thu Feb 12 2015 gil cattaneo <puntogil at libero.it> 2.9.1-4
- introduce license macro
More information about the scm-commits
mailing list