packages: josm/josm.spec, josm/josm-version.patch (NEW), josm/josm-revision...
jajcus
jajcus at pld-linux.org
Wed Apr 21 10:49:26 CEST 2010
Author: jajcus Date: Wed Apr 21 08:49:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- the revision patch added under a new name
---- Files affected:
packages/josm:
josm.spec (1.16 -> 1.17) , josm-version.patch (NONE -> 1.1) (NEW), josm-revision.patch (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/josm/josm.spec
diff -u packages/josm/josm.spec:1.16 packages/josm/josm.spec:1.17
--- packages/josm/josm.spec:1.16 Wed Apr 21 10:44:46 2010
+++ packages/josm/josm.spec Wed Apr 21 10:49:21 2010
@@ -11,7 +11,7 @@
# svn export -r%{version} http://josm.openstreetmap.de/svn/trunk josm-src-snapshot-%{version}
Source0: %{name}-src-snapshot-%{version}.tar.bz2
# Source0-md5: df1534ae026c94309227233aa16209c8
-Patch0: %{name}-revision.patch
+Patch0: %{name}-version.patch
URL: http://josm.openstreetmap.de/
BuildRequires: ant
%buildrequires_jdk
@@ -62,6 +62,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2010/04/21 08:49:21 jajcus
+- the revision patch added under a new name
+
Revision 1.16 2010/04/21 08:44:46 jajcus
- Release: 2
================================================================
Index: packages/josm/josm-version.patch
diff -u /dev/null packages/josm/josm-version.patch:1.1
--- /dev/null Wed Apr 21 10:49:26 2010
+++ packages/josm/josm-version.patch Wed Apr 21 10:49:21 2010
@@ -0,0 +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"/>
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm.spec?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list