[bluecove] Build 1.5 bytecode, rhbz #842576 Drop BR on ant-nodeps, rhbz #992024 Drop versioned jars

[mbooth]

commit 8eec4a8e58189767bbffa802ccaf3f243335161f
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Wed Aug 14 14:56:24 2013 +0100

    Build 1.5 bytecode, rhbz #842576
    Drop BR on ant-nodeps, rhbz #992024
    Drop versioned jars

 bluecove.spec |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/bluecove.spec b/bluecove.spec
index d0a23b5..1bc4c5d 100644
--- a/bluecove.spec
+++ b/bluecove.spec
@@ -3,7 +3,7 @@
 
 Name:           bluecove
 Version:        2.1.1
-Release:        0.6.%{svndate}snap%{snapshot}%{?dist}
+Release:        0.7.%{svndate}snap%{snapshot}%{?dist}
 Summary:        Implementation of JSR-82 Java Bluetooth API
 
 Group:          System Environment/Libraries
@@ -24,13 +24,10 @@ Source3:        http://snapshot.bluecove.org/distribution/download/%{version}-SN
 
 Source4:        README.dist
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  bluez-libs-devel
-BuildRequires:  ant-nodeps
 BuildRequires:  libmatthew-java
 BuildRequires:  dbus-java >= 2.5.1
 Requires:       jpackage-utils
@@ -67,6 +64,10 @@ cp -p bluecove-gpl-%{version}-SNAPSHOT/LICENSE.txt LICENSE-gpl.txt
 # add README.dist
 cp -p %{SOURCE4} .
 
+# Build 1.5 or newer bytecode
+sed -i -e 's/source="..."/source="1.5"/g' -e 's/target="..."/target="1.5"/' \
+  build.xml */build.xml
+
 %build
 # build main bluecove
 ant jar -Dproduct_version=%{version}
@@ -84,7 +85,7 @@ cd ../bluecove-bluez-%{version}-SNAPSHOT
 ant jar -Dproduct_version=%{version} \
         -Dbluecove_main_dist_dir=../target \
         -Ddbus_java_jar=%{_javadir}/dbus-java/dbus.jar \
-        -Dlibmatthew_java_debug_jar=%{_libdir}/libmatthew-java/unix.jar \
+        -Dlibmatthew_java_debug_jar=%{_jnidir}/unix.jar \
         -Dbluecove.native.resources.skip=true \
         -Dbluecove.native.linker.options="" \
         -DCC_compiler_options="${RPM_OPT_FLAGS} -fPIC -fno-stack-protector"
@@ -95,8 +96,6 @@ ant jar -Dproduct_version=%{version} \
         -Dbluecove_main_dist_dir=../target
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}-SNAPSHOT
 
@@ -104,17 +103,13 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}-SNAPSHOT
 # BlueCove #
 ############
 cp -p target/bluecove-%{version}.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-# create symlink without version
-(cd $RPM_BUILD_ROOT%{_javadir}/ && ln -sf %{name}-%{version}.jar %{name}.jar)
+        $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 ################
 # BlueCove GPL #
 ################
 cp -p bluecove-gpl-%{version}-SNAPSHOT/target/bluecove-gpl-%{version}.jar \
-        $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-gpl-%{version}.jar
-# create symlink without version
-(cd $RPM_BUILD_ROOT%{_libdir}/%{name} && ln -sf %{name}-gpl-%{version}.jar %{name}-gpl.jar)
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-gpl.jar
 
 # copy the GPL JNI library to library directory
 cp -p bluecove-gpl-%{version}-SNAPSHOT/target/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}-SNAPSHOT
@@ -123,9 +118,7 @@ cp -p bluecove-gpl-%{version}-SNAPSHOT/target/*.so $RPM_BUILD_ROOT%{_libdir}/%{n
 # BlueCove BlueZ DBUS #
 #######################
 cp -p bluecove-bluez-%{version}-SNAPSHOT/target/bluecove-bluez-%{version}.jar \
-        $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-bluez-%{version}.jar
-# create symlink without version
-(cd $RPM_BUILD_ROOT%{_libdir}/%{name} && ln -sf %{name}-bluez-%{version}.jar %{name}-bluez.jar)
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-bluez.jar
 
 # copy the BlueZ JNI library to library directory
 cp -p bluecove-bluez-%{version}-SNAPSHOT/target/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/%{version}-SNAPSHOT
@@ -134,20 +127,19 @@ cp -p bluecove-bluez-%{version}-SNAPSHOT/target/*.so $RPM_BUILD_ROOT%{_libdir}/%
 # BlueCove Emu #
 ################
 cp -p bluecove-emu-%{version}-SNAPSHOT/target/bluecove-emu-%{version}.jar \
-        $RPM_BUILD_ROOT%{_javadir}/%{name}-emu-%{version}.jar
-# create symlink without version
-(cd $RPM_BUILD_ROOT%{_javadir}/ && ln -sf %{name}-emu-%{version}.jar %{name}-emu.jar)
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-emu.jar
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_libdir}/%{name}
 %doc AUTHORS.txt README.txt LICENSE.txt stacks.txt todo.txt AUTHORS-gpl.txt LICENSE-gpl.txt README.dist
 
 %changelog
+* Wed Aug 14 2013 Mat Booth <fedora at matbooth.co.uk> - 2.1.1-0.7.20101024snap63
+- Build 1.5 bytecode, rhbz #842576
+- Drop BR on ant-nodeps, rhbz #992024
+- Drop versioned jars
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-0.6.20101024snap63
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -171,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT
 - make use of RPM_OPT_FLAGS for compiling JNI libs
 - add license LGPLv2+ to license tag as bluecove-gpl uses it
 
-* Mon Feb 7 2010 François Kooman <fkooman at tuxed.net> - 2.1.1-0.1.20090914snap60
+* Sun Feb 7 2010 François Kooman <fkooman at tuxed.net> - 2.1.1-0.1.20090914snap60
 - rework versio number
 
 * Mon Jan 11 2010 François Kooman <fkooman at tuxed.net> - 2.1.1-0.20090914.1