From 0879af11963dfaaed3e69a24eea20f46a0af0959 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Jan 2014 09:37:52 +0100 Subject: [PATCH] openobex: update to 1.7.1. --- common/shlibs | 2 +- srcpkgs/libopenobex-devel | 1 - srcpkgs/{libopenobex => openobex-devel} | 0 srcpkgs/openobex/template | 45 +++++++++++-------------- 4 files changed, 20 insertions(+), 28 deletions(-) delete mode 120000 srcpkgs/libopenobex-devel rename srcpkgs/{libopenobex => openobex-devel} (100%) diff --git a/common/shlibs b/common/shlibs index ab7a302ed2..1616bc2b7e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -440,7 +440,6 @@ libphysfs.so.1 physfs-2.0.0_1 libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1 libparted.so.2 libparted-3.1_1 libparted-fs-resize.so.0 libparted-3.1_1 -libopenobex.so.1 libopenobex-1.5_1 libntfs-3g.so.84 ntfs-3g-2013.1.13_1 libruby.so.1.9 ruby-1.9.3_1 libruby.so.2.0 ruby-2.0.0_1 @@ -1450,3 +1449,4 @@ libxshmfence.so.1 libxshmfence-1.1_1 libgoffice-0.8.so.8 goffice0.8-0.8.13_1 libgoffice-0.10.so.10 goffice-0.10.9_1 libc++.so.1 libcxx-3.4_1 +libopenobex.so.2 openobex-1.7.1_1 diff --git a/srcpkgs/libopenobex-devel b/srcpkgs/libopenobex-devel deleted file mode 120000 index 10a3245240..0000000000 --- a/srcpkgs/libopenobex-devel +++ /dev/null @@ -1 +0,0 @@ -openobex \ No newline at end of file diff --git a/srcpkgs/libopenobex b/srcpkgs/openobex-devel similarity index 100% rename from srcpkgs/libopenobex rename to srcpkgs/openobex-devel diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index dfb9e298c8..2e6bcab78f 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -1,39 +1,32 @@ # Template file for 'openobex' pkgname=openobex -version=1.5 -revision=7 -build_style=gnu-configure -configure_args="--enable-apps --enable-irda --enable-bluetooth --enable-usb" -makedepends="pkg-config libusb-compat-devel libbluetooth-devel" -short_desc="OpenOBEX applications" +version=1.7.1 +revision=1 +wrksrc="${pkgname}-${version}-Source" +build_style=cmake +configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_SBINDIR=/usr/bin" +hostmakedepends="pkg-config cmake libxslt docbook-xsl" +makedepends="systemd-devel libusb-devel libbluetooth-devel" +replaces="libopenobex>=0" +short_desc="OBEX protocol implementation" homepage="http://dev.zuckschwerdt.org/openobex/" license="LGPL-2" maintainer="Juan RP " -distfiles="http://ftp.osuosl.org/pub/linux/bluetooth/$pkgname-$version.tar.bz2" -checksum=13996a1e3c69d857f1c7b1d0d9f1c674ccd395355dcae1442a91386b4d75254c -long_desc=" - The Object Exchange protocol can best be described as binary HTTP. OBEX - is optimised for ad-hoc wireless links and can be used to exchange all kind - of objects like files, pictures, calendar entries (vCal) and business cards - (vCard). +distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}-${version}-Source.tar.gz" +checksum=3b264665d90901ea4ff720332ffb9b6d1d8f67187463d3a3279caddc7205ea57 - OBEX is builtin in devices like PDA's like the Palm Pilot, and mobile phones - like the Ericsson R320, Siemens S25, Siemens S45, Siemens ME45, Nokia NM207 - and Nokia 9110 Communicator." - -libopenobex_package() { - short_desc="OBEX protocol library" - pkg_install() { - vmove "usr/lib/libopenobex.so*" - } +pre_configure() { + sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' udev/openobex.rules.in } -libopenobex-devel_package() { - depends="libbluetooth-devel libusb-compat-devel libopenobex>=${version}" - short_desc="OBEX protocol library (development files)" +openobex-devel_package() { + depends="libusb-devel ${sourcepkg}>=${version}_${revision}" + replaces="libopenobex-devel>=0" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/cmake } }