From f370bf39c55a2ba9dbce3c2bed0e71c3bfdba31b Mon Sep 17 00:00:00 2001
From: Peter Robinson <perobins@neo.home.roving-it.com>
Date: Sat, 11 Jul 2015 13:45:06 +0100
Subject: [PATCH] - Use %%{_udevrulesdir} so rule.d doesn't inadvertantly end
 up in / like the latest rawhide builds do. - Use %%license, no need for a
 license in -devel a it depends on the root package which ships the license

---
 .gitignore    | 15 +--------------
 libwacom.spec | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59eaf48..34ed5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1 @@
-/libwacom-0.3.tar.bz2
-/libwacom-0.4.tar.xz
-/libwacom-0.5.tar.bz2
-/libwacom-0.6.tar.bz2
-/libwacom-0.6.1.tar.bz2
-/libwacom-0.7.tar.bz2
-/libwacom-0.7.1.tar.bz2
-/libwacom-0.8.tar.bz2
-/libwacom-0.9.tar.bz2
-/libwacom-0.10.tar.bz2
-/libwacom-0.11.tar.bz2
-/libwacom-0.12.tar.bz2
-/libwacom-0.13.tar.bz2
-/libwacom-0.15.tar.bz2
+/libwacom-*.tar.bz2
diff --git a/libwacom.spec b/libwacom.spec
index 3fc886a..c20e469 100644
--- a/libwacom.spec
+++ b/libwacom.spec
@@ -1,8 +1,6 @@
-%global udevdir %(pkg-config --variable=udevdir udev)
-
 Name:           libwacom
 Version:        0.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 
@@ -14,7 +12,7 @@ Source0:        http://prdownloads.sourceforge.net/linuxwacom/%{name}/%{name}-%{
 
 BuildRequires:  autoconf automake libtool doxygen
 BuildRequires:  glib2-devel libgudev1-devel
-BuildRequires:  systemd-devel
+BuildRequires:  systemd systemd-devel
 
 %description
 %{name} is a library that provides information about Wacom tablets and
@@ -46,26 +44,26 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-install -d ${RPM_BUILD_ROOT}/%{udevdir}/rules.d
+install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}/rules.d
 # auto-generate the udev rule from the database entries
 pushd tools
-./generate-udev-rules > ${RPM_BUILD_ROOT}/%{udevdir}/rules.d/65-libwacom.rules
+./generate-udev-rules > ${RPM_BUILD_ROOT}/%{_udevrulesdir}/rules.d/65-libwacom.rules
 popd
 
 # We intentionally don't ship *.la files
-rm -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%doc COPYING README 
+%license COPYING
+%doc README
 %{_libdir}/libwacom.so.*
-%{udevdir}/rules.d/65-libwacom.rules
+%{_udevrulesdir}/rules.d/65-libwacom.rules
 %{_bindir}/libwacom-list-local-devices
 
 %files devel
-%doc COPYING
 %dir %{_includedir}/libwacom-1.0/
 %dir %{_includedir}/libwacom-1.0/libwacom
 %{_includedir}/libwacom-1.0/libwacom/libwacom.h
@@ -81,6 +79,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
+* Sat Jul 11 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.15-2
+- Use %%{_udevrulesdir} so rule.d doesn't inadvertantly end up in /
+- Use %%license
+
 * Wed Jul 08 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.15-1
 - libwacom 0.15