packages: josm/josm-version.patch, josm/josm.spec - %undos build.xml before...

[jajcus]

Author: jajcus                       Date: Wed Apr 21 08:53:29 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %undos build.xml before applying the patch

---- Files affected:
packages/josm:
   josm-version.patch (1.1 -> 1.2) , josm.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/josm/josm-version.patch
diff -u packages/josm/josm-version.patch:1.1 packages/josm/josm-version.patch:1.2
--- packages/josm/josm-version.patch:1.1	Wed Apr 21 10:49:21 2010
+++ packages/josm/josm-version.patch	Wed Apr 21 10:53:24 2010
@@ -1,42 +1,42 @@
---- josm-src-snapshot-3176/build.xml.orig	2010-03-28 16:43:59.000000000 +0200
-+++ josm-src-snapshot-3176/build.xml	2010-04-21 09:12:11.000000000 +0200
-@@ -41,19 +41,11 @@
- 	  -->
- 	<target name="create-revision">
- 		<property name="revision.dir" value="${build.dir}"/>
--		<exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
--			<env key="LANG" value="C"/>
--			<arg value="info"/>
--			<arg value="--xml"/>
--			<arg value="."/>
--		</exec>
--		<xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
--		<delete file="REVISION.XML" />
-+		<loadfile property="version.entry.commit.revision" srcFile="rpm_version"/>
- 		<tstamp>
- 			<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
- 		</tstamp>
- 
--		<property name="version.entry.commit.revision" value="UNKNOWN"/>
- 		<mkdir dir="${revision.dir}" />
- 		<echo file="${revision.dir}/REVISION">
- # automatically generated by JOSM build.xml - do not edit
-@@ -65,16 +57,7 @@
- 
- 
- 	<target name="dist" depends="compile,create-revision">
--
--		<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
--			<env key="LANG" value="C"/>
--			<arg value="info"/>
--			<arg value="--xml"/>
--			<arg value="."/>
--		</exec>
--		<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
--		<delete file="REVISION"/>
--		<property name="version.entry.commit.revision" value="UNKNOWN"/>
-+		<loadfile property="version.entry.commit.revision" srcFile="rpm_version"/>
- 		<property name="version.entry.commit.date" value="UNKNOWN"/>
- 		<echo>Revision ${version.entry.commit.revision}</echo>
- 		<copy file="CONTRIBUTION" todir="build"/>
-
+--- josm-src-snapshot-3176/build.xml.orig	2010-03-28 16:43:59.000000000 +0200
++++ josm-src-snapshot-3176/build.xml	2010-04-21 09:12:11.000000000 +0200
+@@ -41,19 +41,11 @@
+ 	  -->
+ 	<target name="create-revision">
+ 		<property name="revision.dir" value="${build.dir}"/>
+-		<exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
+-			<env key="LANG" value="C"/>
+-			<arg value="info"/>
+-			<arg value="--xml"/>
+-			<arg value="."/>
+-		</exec>
+-		<xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-		<delete file="REVISION.XML" />
++		<loadfile property="version.entry.commit.revision" srcFile="rpm_version"/>
+ 		<tstamp>
+ 			<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+ 		</tstamp>
+ 
+-		<property name="version.entry.commit.revision" value="UNKNOWN"/>
+ 		<mkdir dir="${revision.dir}" />
+ 		<echo file="${revision.dir}/REVISION">
+ # automatically generated by JOSM build.xml - do not edit
+@@ -65,16 +57,7 @@
+ 
+ 
+ 	<target name="dist" depends="compile,create-revision">
+-
+-		<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+-			<env key="LANG" value="C"/>
+-			<arg value="info"/>
+-			<arg value="--xml"/>
+-			<arg value="."/>
+-		</exec>
+-		<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+-		<delete file="REVISION"/>
+-		<property name="version.entry.commit.revision" value="UNKNOWN"/>
++		<loadfile property="version.entry.commit.revision" srcFile="rpm_version"/>
+ 		<property name="version.entry.commit.date" value="UNKNOWN"/>
+ 		<echo>Revision ${version.entry.commit.revision}</echo>
+ 		<copy file="CONTRIBUTION" todir="build"/>
+

================================================================
Index: packages/josm/josm.spec
diff -u packages/josm/josm.spec:1.17 packages/josm/josm.spec:1.18
--- packages/josm/josm.spec:1.17	Wed Apr 21 10:49:21 2010
+++ packages/josm/josm.spec	Wed Apr 21 10:53:24 2010
@@ -28,6 +28,7 @@
 
 %prep
 %setup -qn %{name}-src-snapshot-%{version}
+%undos build.xml
 %patch0 -p1
 
 %build
@@ -62,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/04/21 08:53:24  jajcus
+- %undos build.xml before applying the patch
+
 Revision 1.17  2010/04/21 08:49:21  jajcus
 - the revision patch added under a new name
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm-version.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm.spec?r1=1.17&r2=1.18&f=u