From d2958765514717068f1130b62cb9cfd757792d67 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mar 08 2014 16:16:11 +0000
Subject: Update to 1.0.18 release (rhbz#1058000)


---

diff --git a/.gitignore b/.gitignore
index b6c2293..3402308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /libusbx-1.0.16.tar.bz2
 /libusbx-1.0.17-rc1.tar.bz2
 /libusbx-1.0.17.tar.bz2
+/libusb-1.0.18.tar.bz2
diff --git a/libusbx.spec b/libusbx.spec
index 47f350e..dff7e1a 100644
--- a/libusbx.spec
+++ b/libusbx.spec
@@ -1,11 +1,14 @@
 Summary:        Library for accessing USB devices
 Name:           libusbx
-Version:        1.0.17
+Version:        1.0.18
 Release:        1%{?dist}
-Source0:        http://downloads.sourceforge.net/libusbx/libusbx-%{version}.tar.bz2
+# upstream libusbx has merged back with libusb and is now called libusb again
+# but we already have a libusb package for the old libusb-compat-0.1, so
+# lets stick with the libusbx name for now
+Source0:        http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
 License:        LGPLv2+
 Group:          System Environment/Libraries
-URL:            http://sourceforge.net/apps/mediawiki/libusbx/
+URL:            http://libusb.info
 BuildRequires:  systemd-devel doxygen
 Provides:       libusb1 = %{version}-%{release}
 Obsoletes:      libusb1 <= 1.0.9
@@ -46,7 +49,7 @@ This package contains API documentation for %{name}.
 
 
 %prep
-%setup -q
+%setup -q -n libusb-%{version}
 
 
 %build
@@ -58,7 +61,7 @@ popd
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
@@ -80,6 +83,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Sat Mar  8 2014 Hans de Goede <hdegoede@redhat.com> - 1.0.18-1
+- Update to 1.0.18 release (rhbz#1058000)
+
 * Fri Sep  6 2013 Hans de Goede <hdegoede@redhat.com> - 1.0.17-1
 - Update to 1.0.17 final release
 
diff --git a/sources b/sources
index 41259ef..98c8101 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99467ca2cb81c19c4a172de9f30e7576  libusbx-1.0.17.tar.bz2
+4a6d049923efc6496f1d383054dac1a6  libusb-1.0.18.tar.bz2