rpms/gstreamer-java/EL-5 .cvsignore, 1.2, 1.3 gstreamer-java.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3
Levente Farkas
lfarkas at fedoraproject.org
Fri Nov 14 15:21:38 UTC 2008
- Previous message (by thread): rpms/guidance-power-manager/F-9 guidance-power-manager.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): rpms/kcoloredit/F-10 .cvsignore, 1.7, 1.8 kcoloredit.spec, 1.11, 1.12 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lfarkas
Update of /cvs/pkgs/rpms/gstreamer-java/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11435/EL-5
Modified Files:
.cvsignore gstreamer-java.spec import.log sources
Log Message:
update to version 1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Oct 2008 10:31:13 -0000 1.2
+++ .cvsignore 14 Nov 2008 15:21:08 -0000 1.3
@@ -1 +1 @@
-gstreamer-java-src-0.9.tar.bz2
+gstreamer-java-src-1.0.zip
Index: gstreamer-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/EL-5/gstreamer-java.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-java.spec 28 Oct 2008 10:44:34 -0000 1.2
+++ gstreamer-java.spec 14 Nov 2008 15:21:08 -0000 1.3
@@ -1,23 +1,25 @@
Summary: Java interface to the gstreamer framework
Name: gstreamer-java
-Version: 0.9
-Release: 0.3.20081023hg%{?dist}
+Version: 1.0
+Release: 1%{?dist}
License: LGPLv3 and CC-BY-SA
Group: System Environment/Libraries
URL: http://code.google.com/p/gstreamer-java/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# hg clone -r 538 https://kenai.com/hg/gstreamer-java~mercurial gstreamer-java
-# tar cjvf gstreamer-java-src-%{version}.tar.bz2 --exclude .hg* gstreamer-java
-Source: http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.tar.bz2
+# hg clone -r 541 https://kenai.com/hg/gstreamer-java~mercurial gstreamer-java
+# tar cjvf gstreamer-java-src-1.1.tar.bz2 --exclude .hg* gstreamer-java
+#Source: http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.tar.bz2
+# but now use the released version
+Source: http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.zip
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# for ExcludeArch see bug: 468831
+ExcludeArch: ppc, ppc64
+
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-# versioned require since the bug fixed only this version:
-# "JNA changed the way type mappers were configured for Callbacks"
-#Requires: jna >= 3.0.7
-Requires: jna >= 3.0.4
+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
@@ -25,21 +27,21 @@
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 >= 3.0.7
-BuildRequires: jna >= 3.0.4
+BuildRequires: jna
BuildRequires: libswt3-gtk2
-BuildRequires: ant >= 1.7.0
-BuildRequires: ant-junit >= 1.7.0
-BuildRequires: junit4
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
-# for ExcludeArch see bug: 468831
-ExcludeArch: ppc, ppc64
+%if 0%{?fedora} >= 9
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: junit4
+%endif
%description
An unofficial/alternative set of java bindings for the gstreamer multimedia
@@ -54,22 +56,39 @@
%description javadoc
This package contains the API documentation for %{name}.
+
%prep
-%setup -q -n %{name}
+%setup -q
cp -p src/org/freedesktop/tango/COPYING COPYING.CC-BY-SA
# remove prebuild binaries
find . -name '*.jar' -exec rm {} \;
+
%build
+# replace included jar files with the system packaged version (JNA, SWT)
sed -i -e "s,\(file.reference.jna.jar=\).*,\1$(build-classpath jna)," \
+ -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
+%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)," \
- -e "s,\(run.jvmargs=-Djna.library.path=\).*,\1%{_libdir}:$(pkg-config --variable=pluginsdir gstreamer-0.10)," nbproject/project.properties
-%if 0%{?fedora}
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(build-classpath swt)," nbproject/project.properties
+ nbproject/project.properties
+ant
%else
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," nbproject/project.properties
+# 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
-ant
+
%install
rm -rf %{buildroot}
@@ -79,9 +98,11 @@
mkdir -p -m0755 %{buildroot}%{_javadocdir}/%{name}
cp -rp dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
%clean
rm -rf %{buildroot}
+
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -92,6 +113,10 @@
%{_javadocdir}/%{name}
%changelog
+* Tue Nov 11 2008 Levente Farkas <lfarkas at lfarkas.org> - 1.0-1
+- update to the new upstream version
+- fix EPEL build problems (ant-1.7.0 and junit4)
+
* Tue Oct 28 2008 Levente Farkas <lfarkas at lfarkas.org> - 0.9-0.3.20081023hg
- add ExcludeArch ppc, ppc64 because of bug 468831
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 27 Oct 2008 10:31:13 -0000 1.1
+++ import.log 14 Nov 2008 15:21:08 -0000 1.2
@@ -1 +1,2 @@
gstreamer-java-0_9-0_2_20081023hg_fc9:EL-5:gstreamer-java-0.9-0.2.20081023hg.fc9.src.rpm:1225103441
+gstreamer-java-1_0-1_fc9:EL-5:gstreamer-java-1.0-1.fc9.src.rpm:1226675785
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Oct 2008 10:31:13 -0000 1.2
+++ sources 14 Nov 2008 15:21:08 -0000 1.3
@@ -1 +1 @@
-5342f95ea09bf99ba6e9e29f98d711c8 gstreamer-java-src-0.9.tar.bz2
+639d5b64fbf71054ddc4bbb02e84f398 gstreamer-java-src-1.0.zip
- Previous message (by thread): rpms/guidance-power-manager/F-9 guidance-power-manager.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): rpms/kcoloredit/F-10 .cvsignore, 1.7, 1.8 kcoloredit.spec, 1.11, 1.12 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list