packages: tigase-server/tigase-server.spec, tigase-server/tigase-server-no_...

[jajcus]

Author: jajcus                       Date: Mon May  9 10:37:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not use 'cvsversion' to obtain the build-id

---- Files affected:
packages/tigase-server:
   tigase-server.spec (1.3 -> 1.4) , tigase-server-no_svnversion.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tigase-server/tigase-server.spec
diff -u packages/tigase-server/tigase-server.spec:1.3 packages/tigase-server/tigase-server.spec:1.4
--- packages/tigase-server/tigase-server.spec:1.3	Mon May  9 11:23:58 2011
+++ packages/tigase-server/tigase-server.spec	Mon May  9 12:37:24 2011
@@ -29,6 +29,7 @@
 Patch0:		%{name}-no_bash.patch
 Patch1:		%{name}-paths.patch
 Patch2:		%{name}-start_script.patch
+Patch3:		%{name}-no_svnversion.patch
 URL:		http://www.tigase.org/
 %{?with_tests:BuildRequires:	ant-junit}
 BuildRequires:	java-tigase-utils
@@ -125,6 +126,10 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+echo "build-no=%{build_id}" >> build.properties
+
 
 %build
 export JAVA_HOME="%{java_home}"
@@ -278,6 +283,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/05/09 10:37:24  jajcus
+- do not use 'cvsversion' to obtain the build-id
+
 Revision 1.3  2011/05/09 09:23:58  jajcus
 - Version: 5.1.0-beta2  (beta, but recommended by the author)
 - build from sources

================================================================
Index: packages/tigase-server/tigase-server-no_svnversion.patch
diff -u /dev/null packages/tigase-server/tigase-server-no_svnversion.patch:1.1
--- /dev/null	Mon May  9 12:37:29 2011
+++ packages/tigase-server/tigase-server-no_svnversion.patch	Mon May  9 12:37:24 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/tigase-server/tigase-server.spec?r1=1.3&r2=1.4&f=u