packages: josm/josm-version.patch, josm/josm.spec - Broken snapshot (caused...

[jajcus]

Author: jajcus                       Date: Sun Oct  2 11:07:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Broken snapshot (caused by external apache SVN checkouts not working right)
  replaced with a complete one.
- Release: 2

---- Files affected:
packages/josm:
   josm-version.patch (1.3 -> 1.4) , josm.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/josm/josm-version.patch
diff -u packages/josm/josm-version.patch:1.3 packages/josm/josm-version.patch:1.4
--- packages/josm/josm-version.patch:1.3	Fri Sep 16 15:58:53 2011
+++ packages/josm/josm-version.patch	Sun Oct  2 13:07:19 2011
@@ -36,3 +36,14 @@
          <property name="version.entry.commit.revision" value="UNKNOWN"/>
          <property name="version.entry.commit.date" value="UNKNOWN"/>
          <echo>Revision ${version.entry.commit.revision}</echo>
+--- josm-src-snapshot-4399/build.xml.orig	2011-10-02 12:16:08.000000000 +0200
++++ josm-src-snapshot-4399/build.xml	2011-10-02 12:21:54.312301732 +0200
+@@ -82,7 +82,7 @@
+             <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
+             <manifest>
+                 <attribute name="Main-class" value="JOSM"/>
+-                <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
++                <attribute name="Main-Version" value="${version.entry.commit.revision}"/>
+                 <attribute name="Main-Date" value="${version.entry.commit.date}"/>
+             </manifest>
+             <zipfileset dir="images" prefix="images"/>

================================================================
Index: packages/josm/josm.spec
diff -u packages/josm/josm.spec:1.29 packages/josm/josm.spec:1.30
--- packages/josm/josm.spec:1.29	Fri Sep 16 15:58:53 2011
+++ packages/josm/josm.spec	Sun Oct  2 13:07:19 2011
@@ -1,16 +1,21 @@
 # $Revision$, $Date$
+#
+# TODO:
+#	- fix the startup screen not to ask for update when version is equal to current 'tested'
+#	  (probably we need to tweak the version reported to the server)
+#
 %include	/usr/lib/rpm/macros.java
 Summary:	Java OpenStreetMap Editor
 Summary(pl.UTF-8):	Edytor OpenStreetMap w Javie
 Name:		josm
 Version:	4399
-Release:	1
+Release:	2
 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:	a838d33a55e0fa17750987909b7a98e7
+# Source0-md5:	17d2cbb743378c4728d8ca66caa2b43b
 Patch0:		%{name}-version.patch
 URL:		http://josm.openstreetmap.de/
 BuildRequires:	ant
@@ -32,7 +37,7 @@
 %patch0 -p1
 
 %build
-echo "%{version}" > rpm_version
+echo -n "%{version}" > rpm_version
 %ant
 
 cat > josm <<'EOF'
@@ -63,6 +68,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2011/10/02 11:07:19  jajcus
+- Broken snapshot (caused by external apache SVN checkouts not working right)
+  replaced with a complete one.
+- Release: 2
+
 Revision 1.29  2011/09/16 13:58:53  jajcus
 - Version: 4399
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm-version.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/josm/josm.spec?r1=1.29&r2=1.30&f=u