rpms/josm/devel josm-0-remove_svn_call.patch, 1.1, 1.2 josm.spec, 1.2, 1.3

[Cédric OLIVIER]

Author: cquad

Update of /cvs/pkgs/rpms/josm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18931

Modified Files:
	josm-0-remove_svn_call.patch josm.spec 
Log Message:


josm-0-remove_svn_call.patch:
 build.xml |   40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

Index: josm-0-remove_svn_call.patch
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/josm-0-remove_svn_call.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- josm-0-remove_svn_call.patch	17 Jun 2010 05:48:08 -0000	1.1
+++ josm-0-remove_svn_call.patch	22 Jun 2010 13:47:00 -0000	1.2
@@ -1,26 +1,16 @@
---- build.xml.orig	2010-05-08 17:44:45.000000000 +0200
-+++ build.xml	2010-06-15 22:39:14.030118012 +0200
-@@ -26,53 +26,8 @@
- 		</fileset>
- 	</path>
+--- build.xml.origine	2010-06-22 15:28:37.781274000 +0200
++++ build.xml	2010-06-22 15:32:56.357399489 +0200
+@@ -37,50 +37,26 @@
+ 		<antcall target="create-revision" />
+ 	</target>
  
-+	<target name="dist" depends="compile">
- 
--	<!--
--	  ** Used by Eclipse ant builder for updating
--	  ** the REVISION file used by JOSM
--	-->
--	<target name="create-revision-eclipse">
--		<copy file="styles/standard/elemstyles.xml" todir="data"/>
--		<property name="revision.dir" value="bin"/>
--		<antcall target="create-revision" />
--	</target>
--
 -	<!--
 -	  ** Creates the REVISION file to be included in the distribution
 -	  -->
 -	<target name="create-revision">
--		<property name="revision.dir" value="${build.dir}"/>
++	<target name="dist" depends="compile">
++
+ 		<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"/>
@@ -29,10 +19,10 @@
 -		</exec>
 -		<xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
 -		<delete file="REVISION.XML" />
--		<tstamp>
--			<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
--		</tstamp>
--
+ 		<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">
@@ -53,5 +43,19 @@
 -			<arg value="."/>
 -		</exec>
  		<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
- 		<delete file="REVISION"/>
+-		<delete file="REVISION"/>
  		<property name="version.entry.commit.revision" value="UNKNOWN"/>
+ 		<property name="version.entry.commit.date" value="UNKNOWN"/>
+ 		<echo>Revision ${version.entry.commit.revision}</echo>
+ 		<copy file="CONTRIBUTION" todir="build"/>
+ 		<copy file="README" todir="build"/>
+ 		<copy file="LICENSE" todir="build"/>
++		<echo file="${revision.dir}/REVISION">
++# automatically generated by JOSM build.xml - do not edit
++Revision: ${version.entry.commit.revision}
++Is-Local-Build: true
++Build-Date: ${build.tstamp}
++</echo>
+ 
+ 		<!-- styles -->
+ 		<copy file="styles/standard/elemstyles.xml" todir="build/data"/>


Index: josm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/josm/devel/josm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- josm.spec	18 Jun 2010 05:54:00 -0000	1.2
+++ josm.spec	22 Jun 2010 13:47:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           josm
 Version:        0
-Release:        0.6.%{svn_revision}svn%{?dist}
+Release:        0.7.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -19,17 +19,18 @@ Source4:        %{name}.1
 Source5:        REVISION.XML
 #Source built using the following commands : ./josm-generate-tarball.sh 3329
 
-#remove call to "svn info" and fix in build.xml revision and commit date 
-Patch0:         %{name}-%{version}-remove_svn_call.patch 
-
 #patch to disable oauth, it is needed because oauth requires maven 2.0.9 and a maven > 2.0.8 seels to be only planned for F14
-Patch1:         %{name}-%{version}-disable_oauth.patch
+Patch0:         %{name}-%{version}-disable_oauth.patch
 
 #patch to add javadoc generation in build.xml
-Patch2:         %{name}-%{version}-add_javadoc.patch
+Patch1:         %{name}-%{version}-add_javadoc.patch
 
 #patch to use ant.jar (for bzip2) and commons-codec
-Patch3:         %{name}-%{version}-bzip2.patch
+Patch2:         %{name}-%{version}-bzip2.patch
+
+#remove call to "svn info" and fix in build.xml revision and commit date 
+Patch3:         %{name}-%{version}-remove_svn_call.patch 
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,11 +69,12 @@ This package contains the API documentat
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
+%patch1 -p0
 %patch2 -p0
 %patch3 -p0
 
+
 find . -name '*.jar' -exec rm -f '{}' \;
 find . -name '*.class' -exec rm -f '{}' \;
 
@@ -141,6 +143,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %changelog
 
+* Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.7.3329svn
+- Svn revision added in welcom page
+
 * Fri Jun 18 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.6.3329svn
 - jakarta-commons-codec.jar is deprecated in rawhide to commons-codec.jar