[gstreamer-java] add gstreamer-java-osx.patch and update spec

Levente Farkas lfarkas at fedoraproject.org
Mon Oct 17 10:19:57 UTC 2011


commit dc8aa3724f9a9c4e8c71fef9bbb4f982250e283b
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Mon Oct 17 12:19:02 2011 +0200

    add gstreamer-java-osx.patch and update spec

 gstreamer-java.spec |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer-java.spec b/gstreamer-java.spec
index 28f9c83..f54f068 100644
--- a/gstreamer-java.spec
+++ b/gstreamer-java.spec
@@ -3,13 +3,15 @@
 Summary:	Java interface to the gstreamer framework
 Name:		gstreamer-java
 Version:	1.5
-Release:	2%{?dist}
+Release:	3%{?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.5.zip gstreamer-java -x \*/.svn*
 Source:		http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.zip
 Patch1:		gstreamer-java-swt.patch
+Patch2:		gstreamer-java-osx.patch
+Patch10:	gstreamer-java-1.5.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # for ExcludeArch and no noarch see bug: 468831
 # since noarch pacakge can't contain ExcludeArch :-( imho it's an rpm bug
@@ -27,7 +29,12 @@ BuildRequires:	ant, ant-junit
 BuildRequires:	junit4
 %endif
 %ifarch %{arch_with_swt} noarch
-BuildRequires:	eclipse-swt, jna-contrib
+BuildRequires:	jna-contrib
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+BuildRequires:	eclipse-swt
+%else
+BuildRequires:	libswt3-gtk2
+%endif
 %endif
 
 %description
@@ -39,7 +46,13 @@ framework.
 Summary:	SWT support for %{name}
 Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	eclipse-swt, jna-contrib
+BuildRequires:	jna-contrib
+%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+BuildRequires:	eclipse-swt
+%else
+BuildRequires:	libswt3-gtk2
+%endif
+%endif
 
 %description swt
 This package contains SWT support for %{name}.
@@ -58,6 +71,8 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}
 %ifarch %{arch_with_swt} noarch
 %patch1 -p1 -b .swt
+%patch2 -p1 -b .osx
+%patch10 -p1 -b .15
 # replace included jar files with the system packaged version SWT
 sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
 	nbproject/project.properties
@@ -122,6 +137,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Oct 17 2011 Levente Farkas <lfarkas at lfarkas.org> - 1.5-3
+- Fix BR/R for all target
+- Fix OSX bits
+
 * Fri Oct 14 2011 Alexander Kurtakov <akurtako at redhat.com> 1.5-2
 - Do not use libswt3-gtk2 BR/R (gtk2 is implementation detail for swt and has been removed).
 


More information about the scm-commits mailing list