Author: jajcus Date: Mon May 9 10:31:29 2011 GMT Module: packages Tag: HEAD ---- Log message: - do not use 'svnversion' to obtain the build id
---- Files affected: packages/java-tigase-xmltools: java-tigase-xmltools.spec (1.1 -> 1.2) , java-tigase-xmltools-no_svnversion.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/java-tigase-xmltools/java-tigase-xmltools.spec diff -u packages/java-tigase-xmltools/java-tigase-xmltools.spec:1.1 packages/java-tigase-xmltools/java-tigase-xmltools.spec:1.2 --- packages/java-tigase-xmltools/java-tigase-xmltools.spec:1.1 Mon May 9 10:50:02 2011 +++ packages/java-tigase-xmltools/java-tigase-xmltools.spec Mon May 9 12:31:23 2011 @@ -16,6 +16,7 @@ Group: Libraries/Java Source0: https://projects.tigase.org/attachments/download/19/%{srcname}-%{version}-b%{build_id}.src.tar.gz # Source0-md5: 9bc0f45afc4f0ff4473f69d50cd70240 +Patch0: %{name}-no_svnversion.patch URL: https://projects.tigase.org/projects/tigase-xmltools/ BuildRequires: jpackage-utils BuildRequires: rpm-javaprov @@ -58,6 +59,10 @@ %prep %setup -q -n %{srcname}-%{version}-b%{build_id}.src +%patch0 -p1 + +echo "build-no=%{build_id}" >> build.properties + %build export JAVA_HOME="%{java_home}" @@ -124,6 +129,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/05/09 10:31:23 jajcus +- do not use 'svnversion' to obtain the build id + Revision 1.1 2011/05/09 08:50:02 jajcus - new spec ================================================================ Index: packages/java-tigase-xmltools/java-tigase-xmltools-no_svnversion.patch diff -u /dev/null packages/java-tigase-xmltools/java-tigase-xmltools-no_svnversion.patch:1.1 --- /dev/null Mon May 9 12:31:29 2011 +++ packages/java-tigase-xmltools/java-tigase-xmltools-no_svnversion.patch Mon May 9 12:31:23 2011 @@ -0,0 +1,19 @@ +--- tigase-xmltools-3.3.1-b484.src/build.xml.orig 2008-12-15 23:55:31.000000000 +0100 ++++ tigase-xmltools-3.3.1-b484.src/build.xml 2011-05-09 12:29:03.000000000 +0200 +@@ -16,16 +16,6 @@ + + <target name="prepare-dist" description="Calculate build version"> + <!-- Get revision number --> +- <exec executable="svnversion"> +- <redirector outputproperty="build-no" errorproperty="error-property"> +- <outputfilterchain> +- <tokenfilter> +- <containsregex +- pattern="[^0-9]*([0-9]+).*" replace="\1"/> +- </tokenfilter> +- </outputfilterchain> +- </redirector> +- </exec> + <property name="version" value="${ver}-b${build-no}"/> + <property name="dist" value="dist/${projectname}-${jarfile}-${version}"/> + </target> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-tigase-xmltools/java-tigase-xmltools.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
