rpms/josm/F-12 josm-0-remove_metadata-extractor.patch, NONE, 1.1 josm, 1.1, 1.2 josm.spec, 1.2, 1.3 josm-0-bzip2.patch, 1.1, NONE

[Cédric OLIVIER]

Author: cquad

Update of /cvs/pkgs/rpms/josm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25255

Modified Files:
	josm josm.spec 
Added Files:
	josm-0-remove_metadata-extractor.patch 
Removed Files:
	josm-0-bzip2.patch 
Log Message:


josm-0-remove_metadata-extractor.patch:
 build.xml |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE josm-0-remove_metadata-extractor.patch ---
--- build.xml.origine	2010-06-22 20:15:14.253810000 +0200
+++ build.xml	2010-06-22 20:16:36.211934671 +0200
@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
 			</manifest>
 			<zipfileset dir="images" prefix="images" />
 			<zipfileset dir="data" prefix="data" />
-
-			<!-- All jar files necessary to run only JOSM (no tests) -->
-			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
 		</jar>
 	</target>
 


Index: josm
===================================================================
RCS file: /cvs/pkgs/rpms/josm/F-12/josm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- josm	18 Jun 2010 16:03:42 -0000	1.1
+++ josm	22 Jun 2010 19:44:17 -0000	1.2
@@ -1,4 +1,21 @@
 #!/bin/sh
 # Simple wrapper script used to start JOSM
 
-java $JAVA_OPTS -jar /usr/share/java/josm.jar "$@"
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Configuration
+MAIN_CLASS="JOSM"
+BASE_JARS="josm metadata-extractor ant"
+
+# Set parameters
+set_classpath $BASE_JARS
+
+# Let's start
+run "$@"
+


Index: josm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/josm/F-12/josm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- josm.spec	22 Jun 2010 14:00:03 -0000	1.2
+++ josm.spec	22 Jun 2010 19:44:17 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           josm
 Version:        0
-Release:        0.7.%{svn_revision}svn%{?dist}
+Release:        0.8.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -25,8 +25,8 @@ Patch0:         %{name}-%{version}-disab
 #patch to add javadoc generation in build.xml
 Patch1:         %{name}-%{version}-add_javadoc.patch
 
-#patch to use ant.jar (for bzip2) and commons-codec
-Patch2:         %{name}-%{version}-bzip2.patch
+#patch to remove metadata-extractor of final jar
+Patch2:         %{name}-%{version}-remove_metadata-extractor.patch
 
 #remove call to "svn info" and fix in build.xml revision and commit date 
 Patch3:         %{name}-%{version}-remove_svn_call.patch 
@@ -38,7 +38,7 @@ BuildArch:      noarch
 BuildRequires:  jpackage-utils 
 BuildRequires:  desktop-file-utils
 BuildRequires:  ant
-BuildRequires:  jakarta-commons-codec >= 1.3
+#BuildRequires:  jakarta-commons-codec >= 1.3
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  gettext
 BuildRequires:  metadata-extractor >= 2.3.1
@@ -46,6 +46,7 @@ Requires:       java >= 1:1.6.0 
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
 Requires:       metadata-extractor >= 2.3.1
+Requires:       ant
 
 %description
 JOSM is an editor for OpenStreetMap (OSM) written in Java 
@@ -143,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %changelog
 
+* Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.8.3329svn
+- According to fedora policies by removing metadata-extractor jar file
+
 * Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.7.3329svn
 - Svn revision added in welcom page
 


--- josm-0-bzip2.patch DELETED ---