packages: josm/josm.spec, josm/josm-revision.patch (NEW) - Version: 3196 - ...

[jajcus]

Author: jajcus                       Date: Wed Apr 21 07:21:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 3196
- build from sources
- BuildArch: noarch

---- Files affected:
packages/josm:
   josm.spec (1.14 -> 1.15) , josm-revision.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/josm/josm.spec
diff -u packages/josm/josm.spec:1.14 packages/josm/josm.spec:1.15
--- packages/josm/josm.spec:1.14	Wed Mar 10 09:29:33 2010
+++ packages/josm/josm.spec	Wed Apr 21 09:21:50 2010
@@ -1,21 +1,23 @@
 # $Revision$, $Date$
-# TODO:
-# - move .jar to %%{_javadir}?
 %include	/usr/lib/rpm/macros.java
 Summary:	Java OpenStreetMap Editor
 Summary(pl.UTF-8):	Edytor OpenStreetMap w Javie
 Name:		josm
-Version:	3094
+Version:	3196
 Release:	1
 License:	GPL v2+
 Group:		Applications
-# this should be the 'tested' snapshot, available also at
-# http://josm.openstreetmap.de/josm-tested.jar
-Source0:	http://josm.openstreetmap.de/download/%{name}-snapshot-%{version}.jar
-# Source0-md5:	f3ad62809ae18bc02e31b360c2d1fcce
+# 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:	df1534ae026c94309227233aa16209c8
+Patch0:		%{name}-revision.patch
 URL:		http://josm.openstreetmap.de/
+BuildRequires:	ant
+%buildrequires_jdk
 BuildRequires:	rpm-javaprov
-Requires:	jre-X11 >= 1.5
+Requires:	jre-X11 >= 1.6
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,18 +27,25 @@
 nodes, ways, metadata tags and relations from the OSM database.
 
 %prep
-%setup -q -c -T
+%setup -qn %{name}-src-snapshot-%{version}
+%patch0 -p1
 
 %build
+echo "%{version}" > rpm_version
+%ant
+
 cat > josm <<'EOF'
 #!/bin/sh
-exec java -jar %{_datadir}/%{name}/%{name}-snapshot-%{version}.jar ${1:+"$@"}
+exec java -jar %{_datadir}/%{name}/%{name}-custom.jar ${1:+"$@"}
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}}
-install %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# not into %{_javadir}, as it is not a library, but a stanalone application
+install dist/%{name}-custom.jar $RPM_BUILD_ROOT%{_datadir}/%{name}
 install josm $RPM_BUILD_ROOT%{_bindir}/josm
 
 %clean
@@ -53,6 +62,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/21 07:21:50  jajcus
+- Version: 3196
+- build from sources
+- BuildArch: noarch
+
 Revision 1.14  2010/03/10 08:29:33  amateja
 - updated to 3094
 

================================================================
Index: packages/josm/josm-revision.patch
diff -u /dev/null packages/josm/josm-revision.patch:1.1
--- /dev/null	Wed Apr 21 09:21:55 2010
+++ packages/josm/josm-revision.patch	Wed Apr 21 09:21:50 2010
@@ -0,0 +1,41 @@
+--- 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.14&r2=1.15&f=u