[spymemcached] update to 2.9.1
gil
gil at fedoraproject.org
Fri Oct 4 11:33:58 UTC 2013
commit b9b95887e7233351737c4f57de413abf7a0567fe
Author: gil <puntogil at libero.it>
Date: Fri Oct 4 13:33:19 2013 +0200
update to 2.9.1
.gitignore | 1 +
sources | 2 +-
spymemcached-2.8.12.pom | 31 --
spymemcached-2.8.9-build.patch | 415 --------------------
...0-build.patch => spymemcached-2.9.1-build.patch | 115 ++++--
spymemcached.spec | 14 +-
6 files changed, 91 insertions(+), 487 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee3a5a2..1480c03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/2.8.12.tar.gz
/2.9.0.tar.gz
+/2.9.1.tar.gz
diff --git a/sources b/sources
index e2b51cc..97f8071 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d85c82aff4e8bfc61a4d2141b315d55c 2.9.0.tar.gz
+254896cf4d0631c86290417388587e63 2.9.1.tar.gz
diff --git a/spymemcached-2.9.0-build.patch b/spymemcached-2.9.1-build.patch
similarity index 85%
rename from spymemcached-2.9.0-build.patch
rename to spymemcached-2.9.1-build.patch
index f847177..58ba258 100644
--- a/spymemcached-2.9.0-build.patch
+++ b/spymemcached-2.9.1-build.patch
@@ -1,5 +1,5 @@
---- build.xml 2013-06-04 13:57:02.000000000 +0200
-+++ build.xml-gil 2013-06-13 21:45:23.791302998 +0200
+--- build.xml 2013-07-01 10:51:24.000000000 +0200
++++ build.xml-gil 2013-10-04 13:01:05.543066423 +0200
@@ -20,14 +20,12 @@
SOFTWARE.
-->
@@ -26,28 +26,25 @@
<property name="src.dir" value="${base.src.dir}/main/java" />
<property name="test.dir" value="${base.src.dir}/test/java" />
<property name="script.src.dir" value="${base.src.dir}/scripts" />
-@@ -63,10 +61,19 @@
+@@ -64,7 +62,16 @@
<path id="test.classpath">
<pathelement location="${build.classes}" />
<fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
+ <include name="junit.jar"/>
+ <include name="jmock/jmock.jar"/>
- </fileset>
- </path>
-
++ </fileset>
++ </path>
++
+ <path id="lib.path">
+ <fileset dir="${lib.dir}">
+ <include name="log4j.jar" />
+ <include name="slf4j/api.jar" />
+ <include name="springframework/spring-beans.jar" />
-+ </fileset>
-+ </path>
-+
- <!-- tests -->
- <property name="build.test" location="${build.dir}/test"/>
- <property name="test.log.dir" location="${build.dir}/test/logs"/>
-@@ -113,10 +120,6 @@
+ </fileset>
+ </path>
+
+@@ -114,10 +121,6 @@
<property name="server.port_number" value="11211"/>
<property name="test.type" value="unit"/>
@@ -58,25 +55,23 @@
<!-- maven central repo urls -->
<property name="maven-snapshots-repository-id" value="sonatype-nexus-snapshots" />
<property name="maven-snapshots-repository-url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
-@@ -137,9 +140,16 @@
+@@ -138,7 +141,14 @@
<path id="compile.classpath">
<pathelement location="${build.classes}"/>
<path refid="lib.path"/>
- <path refid="${name}.common.classpath"/>
- </path>
-
++ </path>
++
+ <path id="spymemcached.common.classpath">
+ <path refid="lib.path.id" />
+ <path refid="compile.classpath" />
+ <path refid="test.classpath" />
+ <pathelement location="${build.test.classes}" />
+ <path location="${build.dir}" />
-+ </path>
-+
+ </path>
+
<!-- ======================================
- Section: Initializing
- ====================================== -->
-@@ -149,93 +159,29 @@
+@@ -150,7 +160,9 @@
-->
<path id="lib.path">
<fileset dir="${lib.dir}">
@@ -87,11 +82,11 @@
</fileset>
</path>
- <!-- Classpath for unit tests (superset of compile.classpath) -->
+@@ -158,85 +170,19 @@
<path id="test.classpath">
<pathelement location="${build.test.classes}" />
-+ <pathelement location="${build.classes}" />
<path refid="compile.classpath" />
++ <pathelement location="${build.classes}" />
+ <fileset dir="${lib.dir}">
+ <include name="junit.jar"/>
+ <include name="jmock/jmock.jar"/>
@@ -179,7 +174,7 @@
</target>
<target name="test" depends="compile, compile-test"
-@@ -319,7 +265,7 @@
+@@ -325,7 +271,7 @@
<arg value="+%Y" />
</exec>
<javadoc
@@ -188,7 +183,14 @@
sourcepath="${src.dir}"
destdir="${build.javadoc}"
author="true"
-@@ -332,7 +278,7 @@
+@@ -333,16 +279,17 @@
+ use="true"
+ windowtitle="${name} ${version} API"
+ doctitle="${name} ${version} API"
+- bottom="Copyright &copy; 2006-2009 Dustin Sallings, 2009-2013 Couchbase, Inc.">
++ bottom="Copyright &copy; 2006-2009 Dustin Sallings, 2009-2013 Couchbase, Inc."
++ source="1.6">
+ <packageset dir="${src.dir}">
<include name="**" />
</packageset>
<classpath>
@@ -196,17 +198,25 @@
+ <path refid="compile.classpath" />
</classpath>
</javadoc>
- </target>
-@@ -340,7 +286,7 @@
+ <javadoc
+- packagenames="src"
++ packagenames="net.spy.*"
+ sourcepath="${test.dir}"
+ destdir="${build.javadoc.test}"
+ author="true"
+@@ -361,9 +308,9 @@
<target name="docsjar" depends="docs"
description="Create the documentation jar">
<mkdir dir="${build.dir}/javadocs" />
- <zip destfile="${build.dir}/javadocs/${name}-${version}.jar"
+ <zip destfile="${build.dir}/javadocs/${name}-docs- at VERSION@.jar"
basedir="${build.javadoc}" />
+- <zip destfile="${build.dir}/javadocs/${name}-test-${version}.jar"
++ <zip destfile="${build.dir}/javadocs/${name}-docs-test- at VERSION@.jar"
+ basedir="${build.javadoc.test}" />
</target>
-@@ -353,12 +299,7 @@
+@@ -376,12 +323,7 @@
<arg value="describe" />
<arg value="--abbrev=0" />
</exec>
@@ -220,7 +230,7 @@
<exec executable="${script.src.dir}/write-version-info.sh"
dir="${basedir}" failonerror="true">
<arg value="${build.dir}" />
-@@ -367,7 +308,7 @@
+@@ -390,7 +332,7 @@
</exec>
</target>
@@ -229,17 +239,17 @@
description="Compile and run the project">
<mkdir dir="${build.classes}" />
<javac
-@@ -402,27 +343,26 @@
+@@ -425,27 +367,26 @@
<target name="srcjar" depends="init,jar"
description="Create source jars">
<mkdir dir="${build.dir}/sources" />
- <jar jarfile="${build.dir}/sources/${name}-${version}.jar">
-+ <jar jarfile="${build.dir}/sources/${name}- at VERSION@.jar">
++ <jar jarfile="${build.dir}/sources/${name}-source- at VERSION@.jar">
<fileset dir="${src.dir}" />
<fileset dir="${build.src.dir}" />
</jar>
- <jar jarfile="${build.dir}/sources/${name}-test-${version}.jar">
-+ <jar jarfile="${build.dir}/sources/${name}-test- at VERSION@.jar">
++ <jar jarfile="${build.dir}/sources/${name}-source-test- at VERSION@.jar">
<fileset dir="${test.dir}" />
</jar>
</target>
@@ -262,7 +272,7 @@
</target>
<target name="package" depends="jar,srcjar,docsjar"
-@@ -431,7 +371,7 @@
+@@ -454,7 +395,7 @@
<!-- ======================================
Section: Checkstyle Integration
====================================== -->
@@ -271,7 +281,7 @@
description="Check source code conventions">
<taskdef resource="checkstyletask.properties">
<classpath refid="${name}.checkstyle.classpath" />
-@@ -451,138 +391,12 @@
+@@ -474,173 +415,12 @@
</target>
<!-- ======================================
@@ -345,6 +355,8 @@
- <pom refid="${name}-test" />
- <attach file="${build.dir}/sources/${name}-test-${version}.jar"
- classifier="sources" />
+- <attach file="${build.dir}/javadocs/${name}-test-${version}.jar"
+- classifier="javadoc" />
- </artifact:install>
- </target>
-
@@ -390,7 +402,40 @@
- <arg value="-Dclassifier=javadoc" />
- <arg value="-Pgpg" />
- </artifact:mvn>
+-
+- <!-- sign and deploy the main artifact -->
+- <artifact:mvn>
+- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+- <arg value="-Durl=${maven-staging-repository-url}" />
+- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+- <arg value="-DpomFile=${spymemcached-test.pom}" />
+- <arg value="-Dfile=${build.dir}/jars/${name}-test-${version}.jar" />
+- <arg value="-Pgpg" />
+- </artifact:mvn>
+-
+- <!-- sign and deploy the sources artifact -->
+- <artifact:mvn>
+- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+- <arg value="-Durl=${maven-staging-repository-url}" />
+- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+- <arg value="-DpomFile=${spymemcached-test.pom}" />
+- <arg value="-Dfile=${build.dir}/sources/${name}-test-${version}.jar" />
+- <arg value="-Dclassifier=sources" />
+- <arg value="-Pgpg" />
+- </artifact:mvn>
+-
+- <!-- sign and deploy the javadoc artifact -->
+- <artifact:mvn>
+- <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+- <arg value="-Durl=${maven-staging-repository-url}" />
+- <arg value="-DrepositoryId=${maven-staging-repository-id}" />
+- <arg value="-DpomFile=${spymemcached-test.pom}" />
+- <arg value="-Dfile=${build.dir}/javadocs/${name}-test-${version}.jar" />
+- <arg value="-Dclassifier=javadoc" />
+- <arg value="-Pgpg" />
+- </artifact:mvn>
- </target>
+-
- <!-- ======================================
- Section: Stage Maven locally
- ====================================== -->
@@ -411,7 +456,7 @@
<mkdir dir="${findbugs.out.dir}"/>
<findbugs home="${findbugs.home}" output="xml:withMessages"
outputFile="${findbugs.output.xml.file}" effort="max"
-@@ -605,13 +419,13 @@
+@@ -663,13 +443,13 @@
<target name="check-for-findbugs" depends="warn-findbugs-unset">
<available property="findbugs.present"
diff --git a/spymemcached.spec b/spymemcached.spec
index ff04cfb..5bc0e25 100644
--- a/spymemcached.spec
+++ b/spymemcached.spec
@@ -1,8 +1,7 @@
Name: spymemcached
-Version: 2.9.0
-Release: 3%{?dist}
+Version: 2.9.1
+Release: 1%{?dist}
Summary: Java client for memcached
-Group: Development/Libraries
# ASL src/scripts/write-version-info.sh
License: ASL 2.0 and MIT
Url: http://code.google.com/p/spymemcached/
@@ -12,7 +11,7 @@ Source0: https://github.com/dustin/java-memcached-client/archive/%{version
# disable ivy and maven-ant-tasks support
# use system libraries
# disable test: require jmock 1.x
-Patch0: %{name}-2.9.0-build.patch
+Patch0: %{name}-2.9.1-build.patch
# fix pom entries
Patch1: %{name}-2.9.0-fix-template-pom.patch
@@ -44,7 +43,6 @@ BuildArch: noarch
A simple, asynchronous, single-threaded memcached client written in java.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
%description javadoc
@@ -60,6 +58,9 @@ find -name '*.class' -delete
sed -i "s|@VERSION@|%{version}|" build.xml
+native2ascii -encoding UTF-8 src/test/java/net/spy/memcached/ProtocolBaseCase.java \
+ src/test/java/net/spy/memcached/ProtocolBaseCase.java
+
%build
%ant jar docs
@@ -87,6 +88,9 @@ cp -pr build/docs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Fri Oct 04 2013 gil cattaneo <puntogil at libero.it> 2.9.1-1
+- update to 2.9.1
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list