rpms/gstreamer-java/F-13 gstreamer-java-swt.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gstreamer-java.spec, 1.12, 1.13 import.log, 1.5, 1.6 sources, 1.5, 1.6 gstreamer-java-1.2-swt.patch, 1.1, NONE gstreamer-java-1.3-overlay.patch, 1.1, NONE

[Levente Farkas]

Author: lfarkas

Update of /cvs/pkgs/rpms/gstreamer-java/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17426/F-13

Modified Files:
	.cvsignore gstreamer-java.spec import.log sources 
Added Files:
	gstreamer-java-swt.patch 
Removed Files:
	gstreamer-java-1.2-swt.patch gstreamer-java-1.3-overlay.patch 
Log Message:
update to 1.4


gstreamer-java-swt.patch:
 build.xml |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE gstreamer-java-swt.patch ---
diff -up ./build.xml.swt ./build.xml
--- ./build.xml.swt	2010-04-28 14:04:43.358575876 +0200
+++ ./build.xml	2010-04-28 14:04:33.350575644 +0200
@@ -72,11 +72,9 @@
 
     -->
 
-<!--
 <target name="-post-jar">
     <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${javac.classpath}"/>
     <jar includes="${excludes}" destfile="${dist.dir}/gstreamer-java-swt.jar" basedir="${build.dir}"/>
 </target>
--->
 
 </project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	4 Jan 2010 15:21:25 -0000	1.5
+++ .cvsignore	23 Jun 2010 13:01:09 -0000	1.6
@@ -1 +1 @@
-gstreamer-java-src-1.3.zip
+gstreamer-java-src-1.4.zip


Index: gstreamer-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-13/gstreamer-java.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gstreamer-java.spec	17 Feb 2010 10:35:18 -0000	1.12
+++ gstreamer-java.spec	23 Jun 2010 13:01:10 -0000	1.13
@@ -2,50 +2,37 @@
 
 Summary:	Java interface to the gstreamer framework
 Name:		gstreamer-java
-Version:	1.3
-Release:	3%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 License:	LGPLv3 and CC-BY-SA
 Group:		System Environment/Libraries
 URL:		http://code.google.com/p/gstreamer-java/
-# zip -r ~/rpm/SOURCES/gstreamer-java-src-1.3.zip gstreamer-java -x \*/.svn*
+# zip -r ~/rpm/SOURCES/gstreamer-java-src-1.4.zip gstreamer-java -x \*/.svn*
 Source:		http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.zip
-Patch1:		%{name}-1.2-swt.patch
-Patch2:		%{name}-1.3-overlay.patch
+Patch1:		%{name}-swt.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+BuildArch:	noarch
+%else
 # for ExcludeArch and no noarch see bug: 468831
 # since noarch pacakge can't contain ExcludeArch :-( imho it's an rpm bug
-#BuildArch:	noarch
 ExcludeArch:	ppc ppc64
+%endif
+
 # Don't build debuginfo packages since it's actualy a noarch package
 %global debug_package %{nil}
 
-Requires:	java >= 1:1.6.0
-Requires:	jpackage-utils
-Requires:	jna
-# versioned gstreamer required since earlier version don't have features like:
-# gst_caps_merge, gst_query_new_latency
-Requires:	gstreamer >= 0.10.19
-Requires:	gstreamer-plugins-base >= 0.10.19
-Conflicts:	gstreamer-plugins-good < 0.10.7
-Conflicts:	gstreamer-plugins-ugly < 0.10.7
-Conflicts:	gstreamer-plugins-bad < 0.10.6
-
-BuildRequires:	java-devel >= 1:1.6.0
-BuildRequires:	jpackage-utils
-BuildRequires:	jna
-%ifarch %{arch_with_swt}
-BuildRequires:	libswt3-gtk2
-%endif
-BuildRequires:	gstreamer-devel >= 0.10.19
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.19
-BuildRequires:	gstreamer-plugins-good-devel >= 0.10.7
-#BuildRequires:	gstreamer-plugins-ugly-devel >= 0.10.7
-#BuildRequires:	gstreamer-plugins-bad-devel >= 0.10.6
-BuildRequires:	ant
-BuildRequires:	ant-junit
-%if 0%{?fedora} >= 9
+Requires:	java >= 1:1.6.0, java, jpackage-utils, jna
+Requires:	gstreamer, gstreamer-plugins-base, gstreamer-plugins-good
+BuildRequires:	java-devel >= 1:1.6.0, jpackage-utils, jna
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, gstreamer-plugins-good
+BuildRequires:	ant, ant-junit
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
 BuildRequires:	junit4
 %endif
+%ifarch %{arch_with_swt} noarch
+BuildRequires:	libswt3-gtk2
+%endif
 
 %description
 An unofficial/alternative set of java bindings for the gstreamer multimedia
@@ -73,14 +60,9 @@ sed -i -e "s,\(file.reference.jna.jar=\)
 	-e "s,\(run.jvmargs=-Djna.library.path=\).*,\1%{_libdir}:$(pkg-config --variable=pluginsdir gstreamer-0.10)," \
 	nbproject/project.properties
 
-%ifarch %{arch_with_swt}
+%patch1 -p1
 sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
 	nbproject/project.properties
-%else
-%patch1 -p1
-rm -rf src/org/gstreamer/swt src/org/gstreamer/example/SWTOverlayPlayer.java
-%endif
-%patch2
 
 
 %build
@@ -88,7 +70,7 @@ rm -rf src/org/gstreamer/swt src/org/gst
 # 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
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
 sed -i -e "s,\(file.reference.junit4.jar=\).*,\1$(build-classpath junit4)," \
 	nbproject/project.properties
 %else
@@ -99,7 +81,7 @@ ant jar
 ant javadoc
 
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
 %check
 ant test
 %endif
@@ -128,6 +110,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 26 2010 Levente Farkas <lfarkas at lfarkas.org> - 1.4-1
+- update to 1.4
+- drop upstream XOverlay patch
+
 * Tue Feb 16 2010 Levente Farkas <lfarkas at lfarkas.org> - 1.3-3
 - fix XOverlay on windows
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-13/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	17 Feb 2010 10:35:18 -0000	1.5
+++ import.log	23 Jun 2010 13:01:10 -0000	1.6
@@ -3,3 +3,4 @@ gstreamer-java-1_0-1_fc9:HEAD:gstreamer-
 gstreamer-java-1_2-1_fc10:HEAD:gstreamer-java-1.2-1.fc10.src.rpm:1246391586
 gstreamer-java-1_3-1_fc12:HEAD:gstreamer-java-1.3-1.fc12.src.rpm:1262618370
 gstreamer-java-1_3-3_fc12:F-13:gstreamer-java-1.3-3.fc12.src.rpm:1266402675
+gstreamer-java-1_4-1_fc12:F-13:gstreamer-java-1.4-1.fc12.src.rpm:1277298036


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	4 Jan 2010 15:21:26 -0000	1.5
+++ sources	23 Jun 2010 13:01:10 -0000	1.6
@@ -1 +1 @@
-93318e3c1dfd5e35cacba863f4209654  gstreamer-java-src-1.3.zip
+b9fab4acd2bc30507415ec6d84ff0ed3  gstreamer-java-src-1.4.zip


--- gstreamer-java-1.2-swt.patch DELETED ---


--- gstreamer-java-1.3-overlay.patch DELETED ---