Replace udev with systemd, use prefix for udev rules

This commit is contained in:
Peter Hutterer 2012-06-07 11:54:28 +10:00
parent 557215ae5f
commit 03577f3f3e

View File

@ -8,7 +8,7 @@
Summary: Xorg X11 wacom input driver Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom Name: xorg-x11-drv-wacom
Version: 0.15.0 Version: 0.15.0
Release: 1%{?gitdate:.%{gitdate}}%{?dist} Release: 2%{?gitdate:.%{gitdate}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: GPLv2+ License: GPLv2+
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
@ -25,11 +25,10 @@ ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
BuildRequires: xorg-x11-server-sdk >= 1.10.99.902 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
BuildRequires: xorg-x11-util-macros >= 1.3.0 BuildRequires: xorg-x11-util-macros >= 1.3.0
BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel BuildRequires: libX11-devel libXi-devel libXrandr-devel libXinerama-devel
BuildRequires: libudev-devel BuildRequires: systemd-devel
Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires xinput) Requires: Xorg %(xserver-sdk-abi-requires xinput)
Requires: udev libudev
Provides: linuxwacom = %{version}-%{release} Provides: linuxwacom = %{version}-%{release}
Obsoletes: linuxwacom <= 0.8.4.3 Obsoletes: linuxwacom <= 0.8.4.3
@ -57,8 +56,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# should be fixed in upstream Makefile.am or whatever. # should be fixed in upstream Makefile.am or whatever.
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
install -d $RPM_BUILD_ROOT/lib/udev/rules.d install -d $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/70-wacom.rules install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/70-wacom.rules
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -75,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xsetwacom.1* %{_mandir}/man1/xsetwacom.1*
%{_datadir}/X11/xorg.conf.d/50-wacom.conf %{_datadir}/X11/xorg.conf.d/50-wacom.conf
%{_bindir}/xsetwacom %{_bindir}/xsetwacom
/lib/udev/rules.d/70-wacom.rules %{_prefix}/lib/udev/rules.d/70-wacom.rules
%package devel %package devel
Summary: Xorg X11 wacom input driver development package Summary: Xorg X11 wacom input driver development package
@ -98,6 +97,9 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger %{_bindir}/isdv4-serial-debugger
%changelog %changelog
* Thu Jun 07 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.15.0-2
- Replace udev with systemd, use prefix for udev rules
* Fri May 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.15.0-1 * Fri May 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.15.0-1
- wacom 0.15.0 - wacom 0.15.0