Author: jajcus Date: Fri Sep 16 13:58:58 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- Version: 4399
---- Files affected:
packages/josm:
josm-version.patch (1.2 -> 1.3) , josm.spec (1.28 -> 1.29)
---- Diffs:
================================================================
Index: packages/josm/josm-version.patch
diff -u packages/josm/josm-version.patch:1.2
packages/josm/josm-version.patch:1.3
--- packages/josm/josm-version.patch:1.2 Wed Apr 21 10:53:24 2010
+++ packages/josm/josm-version.patch Fri Sep 16 15:58:53 2011
@@ -1,42 +1,38 @@
---- 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 @@
+diff -dur josm-src-snapshot-4399.orig/build.xml
josm-src-snapshot-4399/build.xml
+--- josm-src-snapshot-4399.orig/build.xml 2011-09-16 12:58:47.000000000
+0200
++++ josm-src-snapshot-4399/build.xml 2011-09-16 14:36:01.000000000 +0200
+@@ -41,17 +41,7 @@
-->
- <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"/>
-
+ <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"/>
+- <tstamp>
+- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
+- </tstamp>
++ <loadfile property="version.entry.commit.revision"
srcFile="rpm_version" />
+ <property name="version.entry.commit.revision" value="UNKNOWN"/>
+ <mkdir dir="${revision.dir}"/>
+ <echo file="${revision.dir}/REVISION">
+@@ -62,14 +52,7 @@
+ </echo>
+ </target>
+ <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"/>
++ <loadfile property="version.entry.commit.revision"
srcFile="rpm_version" />
+ <property name="version.entry.commit.revision" value="UNKNOWN"/>
+ <property name="version.entry.commit.date" value="UNKNOWN"/>
+ <echo>Revision ${version.entry.commit.revision}</echo>
================================================================
Index: packages/josm/josm.spec
diff -u packages/josm/josm.spec:1.28 packages/josm/josm.spec:1.29
--- packages/josm/josm.spec:1.28 Sat May 14 11:20:37 2011
+++ packages/josm/josm.spec Fri Sep 16 15:58:53 2011
@@ -3,14 +3,14 @@
Summary: Java OpenStreetMap Editor
Summary(pl.UTF-8): Edytor OpenStreetMap w Javie
Name: josm
-Version: 4064
+Version: 4399
Release: 1
License: GPL v2+
Group: Applications
# this should be the 'tested' snapshot, as list on the web page
# svn export -r%{version} http://josm.openstreetmap.de/svn/trunk
josm-src-snapshot-%{version}
Source0: %{name}-src-snapshot-%{version}.tar.bz2
-# Source0-md5: f03f7f9d7367bcbc63d52eacc4c20fef
+# Source0-md5: a838d33a55e0fa17750987909b7a98e7
Patch0: %{name}-version.patch
URL: http://josm.openstreetmap.de/
BuildRequires: ant
@@ -63,6 +63,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.29 2011/09/16 13:58:53 jajcus
+- Version: 4399
+
Revision 1.28 2011/05/14 09:20:37 jajcus
- Version: 4064
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm-version.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm.spec?r1=1.28&r2=1.29&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
