[josm/f16] remove code copy from source and include as lib

[Cédric OLIVIER]

commit 6daf415ebfbc055b47b286e0c8bf721a61fdfb34
Author: Cédric OLIVIER <cedric.olivier at free.fr>
Date:   Fri Oct 19 19:56:28 2012 +0200

    remove code copy from source and include as lib

 josm.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/josm.spec b/josm.spec
index 738246e..97562b5 100644
--- a/josm.spec
+++ b/josm.spec
@@ -6,7 +6,7 @@
 
 Name:           josm
 Version:        0
-Release:        0.34.%{svn_revision}svn%{?dist}
+Release:        0.35.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -38,6 +38,8 @@ BuildRequires:  signpost-core >= 1.2.1.1
 BuildRequires:  metadata-extractor >= 2.3.1
 BuildRequires:  svgsalamander
 BuildRequires:  apache-commons-codec
+BuildRequires:  gnu-getopt
+BuildRequires:  gdata-java
 Requires:       java >= 1:1.6.0 
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
@@ -45,6 +47,8 @@ Requires:       metadata-extractor >= 2.3.1
 Requires:       ant
 Requires:       signpost-core >= 1.2.1.1
 Requires:       svgsalamander
+Requires:       gnu-getopt
+Requires:       gdata-java
 
 %description
 JOSM is an editor for OpenStreetMap (OSM) written in Java 
@@ -78,7 +82,8 @@ find . -name '*.class' -exec rm -f '{}' \;
 rm -rf ./src/oauth
 # removing metadata-extractor and svgSalamander sources files and include metadata-extractor and svgSalamander dependencies
 rm -rf ./src/com
-
+# removing gnu-getopt from sources and include it as dependencie
+rm -rf ./src/gnu
 
 ln -s $(build-classpath metadata-extractor) lib/metadata-extractor.jar
 ln -s $(build-classpath signpost-core) lib/signpost-core.jar
@@ -86,6 +91,8 @@ ln -s $(build-classpath svgsalamander) lib/svgsalamander.jar
 ln -s $(build-classpath javacc) tools/javacc.jar
 ln -s $(build-classpath commons-codec) lib/apache-commons-codec.jar
 ln -s $(build-classpath ant) lib/ant.jar
+ln -s $(build-classpath gnu-getopt) lib/gnu-getopt.jar
+ln -s $(build-classpath gdata-java) lib/gdtata-javav.jar
 
 iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
 
@@ -147,6 +154,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Oct 19 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.35.5531svn
+- Suppress bad code copy in source and include it as lib.
+
 * Mon Oct 08 2012 Cédric OLIVIER <cedric.olivier at free.fr> 0-0.34.5531svn
 - Update to 5531 svn revision