libusb: libusbx has been merged into libusb 1.0.18 again.

diff --git a/libusbx/libusbx.nm b/libusb/libusb.nm
similarity index 74%
rename from libusbx/libusbx.nm
rename to libusb/libusb.nm
index 6394d04577bbbf0de555d727f19c0f2f016e6e28..8c9129d62d72940b6201bfa915be87f4d30ea05d 100644 (file)
--- a/libusbx/libusbx.nm
+++ b/libusb/libusb.nm
@@ -3,12 +3,12 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = libusbx
-version    = 1.0.11
+name       = libusb
+version    = 1.0.18
 release    = 1
 
 groups     = System/Libraries
-url        = http://sourceforge.net/apps/mediawiki/libusbx/
+url        = http://sourceforge.net/apps/mediawiki/libusb/
 license    = LGPLv2+
 summary    = A library which allows userspace access to USB devices.
 
@@ -16,10 +16,14 @@ description
        This package provides a way for applications to access USB devices.
 end
 
-source_dl  = http://downloads.sourceforge.net/libusbx/
+source_dl  = http://downloads.sourceforge.net/libusb/libusb-1.0/
 sources    = %{thisapp}.tar.bz2
 
 build
+       requires
+               libudev-devel
+       end
+
        configure_options += \
                --disable-static \
                --enable-examples-build
@@ -27,8 +31,8 @@ end
 
 packages
        package %{name}
-               provides  = libusb = %{thisver}
-               obsoletes = libusb < %{thisver}
+               provides  = libusbx = %{thisver}
+               obsoletes = libusbx < %{thisver}
        end
 
        package %{name}-devel