rpms/gstreamer-java/devel gstreamer-java.spec,1.3,1.4

[Levente Farkas]

Author: lfarkas

Update of /cvs/pkgs/rpms/gstreamer-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9482

Modified Files:
	gstreamer-java.spec 
Log Message:
update spec file to build on x86_64 too



Index: gstreamer-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/devel/gstreamer-java.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-java.spec	14 Nov 2008 14:45:24 -0000	1.3
+++ gstreamer-java.spec	12 Feb 2009 16:19:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:	Java interface to the gstreamer framework
 Name:		gstreamer-java
 Version:	1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	LGPLv3 and CC-BY-SA
 Group:		System Environment/Libraries
 URL:		http://code.google.com/p/gstreamer-java/
@@ -65,26 +65,22 @@
 
 
 %build
-# replace included jar files with the system packaged version (JNA, SWT)
+# replace included jar files with the system packaged version (JNA, JUnit4, SWT, GStreamer plugins dir)
 sed -i -e "s,\(file.reference.jna.jar=\).*,\1$(build-classpath jna)," \
+	-e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
 	-e "s,\(run.jvmargs=-Djna.library.path=\).*,\1%{_libdir}:$(pkg-config --variable=pluginsdir gstreamer-0.10)," \
 	nbproject/project.properties
 
 # from Fedora-9 we've got ant-1.7.0 and junit4 while on older releases and EPEL
-# have only ant-1.6.5 and junit-3.8.2
+# have only ant-1.6.5 and junit-3.8.2 therefore on older releases and EPEL we
+# have small hacks like ant-1.6.5 need packagenames for javadoc task
+# and test targets need ant-1.7.x and junit4 so we skip the test during packaging
 %if 0%{?fedora} >= 9
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(build-classpath swt)," \
-	-e "s,\(file.reference.junit-4.4.jar=\).*,\1$(build-classpath junit4)," \
+sed -i -e "s,\(file.reference.junit-4.4.jar=\).*,\1$(build-classpath junit4)," \
 	nbproject/project.properties
 ant
 %else
-# from Fedora-9 we've got swt.jar at the standard path (ie. build-classpath 
-# find it), but older releases and EPEL we've to find it and
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
-	nbproject/project.properties
-# ant-1.6.5 need packagenames for javadoc task
 sed -i -e 's,\(<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}"\),\1 packagenames="*",' build.xml
-# test targets need ant-1.7.x and junit4 so we skip the test during packaging.
 ant jar
 ant javadoc
 %endif