[josm] Update to 5047 svn revision

Cédric OLIVIER cquad at fedoraproject.org
Sat Mar 10 18:17:15 UTC 2012


commit b08fa17d24b97967e67ba80d364b5cd0b6be2a98
Author: cquad <cedric.olivier at free.fr>
Date:   Sat Mar 10 19:17:11 2012 +0100

    Update to 5047 svn revision

 .gitignore               |    1 +
 josm-0-add_javadoc.patch |   44 +++++++++++++++++++++-----------------------
 josm.spec                |   10 +++++++---
 sources                  |    2 +-
 4 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5de71c4..0ddfbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ josm-0.3376svn.tar.gz
 /josm-0.4279svn.tar.gz
 /josm-0.4550svn.tar.gz
 /josm-0.4667svn.tar.gz
+/josm-0.5047svn.tar.gz
diff --git a/josm-0-add_javadoc.patch b/josm-0-add_javadoc.patch
index b487a50..1439c74 100644
--- a/josm-0-add_javadoc.patch
+++ b/josm-0-add_javadoc.patch
@@ -1,26 +1,24 @@
---- build.xml.patch0	2011-06-25 18:51:06.000000000 +0200
-+++ build.xml	2011-07-17 11:43:35.674747799 +0200
-@@ -279,4 +279,23 @@ Build-Date: ${build.tstamp}
-             <path path="${dir}"/>
-         </as:check-signature>
+--- build.xml.patch1	2012-01-21 17:38:35.000000000 +0100
++++ build.xml	2012-03-10 18:35:20.623664207 +0100
+@@ -316,4 +316,21 @@ Build-Date: ${build.tstamp}
+       </findbugs>
      </target>
+ 
++    <target name="javadoc" description="generate javadoc documentation">
++       <javadoc
++           destdir="javadoc"
++           defaultexcludes="yes"
++           author="true"
++           version="true"
++           use="true"
++           access="protected"
++           windowtitle="josm javadoc"
++           failonerror="true">
++           <packageset dir="src">
++               <include name="org/openstreetmap/josm/gui"/>	
++               <exclude name="org.xnap.*" />
++           </packageset>
++      </javadoc>
++   </target>
 +
-+ 
-+      <target name="javadoc" description="generate javadoc documentation">
-+        <javadoc
-+            destdir="javadoc"
-+            defaultexcludes="yes"
-+            author="true"
-+            version="true"
-+            use="true"
-+            access="protected"
-+            windowtitle="josm javadoc"
-+            failonerror="true">
-+            <packageset dir="src">
-+                <include name="org/openstreetmap/josm/gui"/>
-+		<exclude name="org.xnap.*" />
-+            </packageset>
-+        </javadoc>
-+      </target>
-+ 
  </project>
diff --git a/josm.spec b/josm.spec
index 0d26aa7..7d402cc 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
 #
 # spec file for package josm
 
-%global svn_revision 4667
+%global svn_revision 5047
 
 
 Name:           josm
 Version:        0
-Release:        0.26.%{svn_revision}svn%{?dist}
+Release:        0.27.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -40,6 +40,7 @@ BuildRequires:  javacc
 BuildRequires:  signpost-core >= 1.2.1.1
 BuildRequires:  metadata-extractor >= 2.3.1
 BuildRequires:  svgsalamander
+BuildRequires:  apache-commons-codec
 Requires:       java >= 1:1.6.0 
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
@@ -88,7 +89,7 @@ ln -s $(build-classpath metadata-extractor) lib/metadata-extractor.jar
 ln -s $(build-classpath signpost-core) lib/signpost-core.jar
 ln -s $(build-classpath svgsalamander) lib/svgsalamander.jar
 ln -s $(build-classpath javacc) tools/javacc.jar
-
+ln -s $(build-classpath apache-commons-codec) lib/apache-commons-codec.jar
 
 iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
 
@@ -150,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Mar 10 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.27.5047svn
+- Update to 5047 svn revision
+
 * Sat Jan 21 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.26.4667svn
 - Update to 4667 svn revision
 
diff --git a/sources b/sources
index c5fd4ab..05766c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-470be3697a446a16df14c6fd7e203e1e  josm-0.4667svn.tar.gz
+3845decb3ed63792d054e2a0769c45d4  josm-0.5047svn.tar.gz


More information about the scm-commits mailing list