Fix datadir and client service type

Signed-off-by: Jonathan Dieter <jdieter@lesbg.com>

.gitignore

@@ -1 +1,2 @@
 /usbip-3.18.tar.xz
+/usbip-3.17.tar.xz

sources

@@ -1 +1 @@
-e90a3347a759ab9ba0000bd358012974  usbip-3.18.tar.xz
+505edf0251e36244f619c8008dd42a2c  usbip-3.17.tar.xz

usbip-client.service

@@ -2,7 +2,7 @@
 Description=USB/IP client modules
 
 [Service]
-Type=OneShot
+Type=oneshot
 RemainAfterExit=true
 ExecStart=/sbin/modprobe -qab vhci-hcd
 

usbip.spec

@@ -4,8 +4,8 @@ Name:		usbip
 License:	GPLv2+
 Summary:	USB/IP user-space
 Group:		System Environment/Daemons
-Version:	3.18
-Release:	3%{?dist}
+Version:	3.17
+Release:	4%{?dist}
 #Source:	https://www.kernel.org/pub/linux/kernel/v3.x/linux-%%{version}.tar.xz
 # In the interests of keeping the source rpm from being ridiculously large,
 # download the Linux kernel from above and run `extract_usbip.sh <version>`
@@ -15,9 +15,7 @@ Source:		usbip-%{version}.tar.xz
 Source1:	usbip-server.service
 Source2:	usbip-client.service
 Source99:	extract_usbip.sh
-Requires:	kmod(usbip-core.ko)
-Requires:	kmod(usbip-host.ko)
-Requires:	kmod(vhci-hcd.ko)
+Requires:	kernel-modules-extra
 Requires:	hwdata
 Requires(post):	systemd
 Requires(preun):	systemd
@@ -51,7 +49,7 @@ development
 
 %build
 ./autogen.sh
-%configure --disable-static --with-usbids-dir=%{_datadir}hwdata
+%configure --disable-static --with-usbids-dir=%{_datadir}/hwdata
 make %{?_smp_mflags}
 
 %install
@@ -86,10 +84,18 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 %{_libdir}/*.so
 
 %changelog
-* Thu Jan 15 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.18-3
+* Thu Feb  5 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-4
+- Fix datadir (#1189855)
+- Fix client service type
+
+* Mon Feb  2 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-3.1
+- Change requires for F20 because kernel-modules-extra doesn't provide
+  individual modules
+
+* Thu Jan 15 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-3
 - Improve description
 
-* Wed Jan 14 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.18-2
+* Wed Jan 14 2015 - Jonathan Dieter <jdieter@lesbg.com> - 3.17-2
 - Remove clean section
 - Remove defattr in files list
 - Use license macro for COPYING
@@ -98,7 +104,6 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 - Remove /etc/default config file
 - Stop rmmoding when services stop
 - Remove unneeded After=syslog.target in services
-- Update to 3.18
 - Replace /usr/share with datadir macro in configure
 - Switch to make_install macro
 - When manually using install, preserve timestamps