Accepting request 139167 from Base:System
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/139167 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=100
This commit is contained in:
commit
84c192b446
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 17 09:18:47 UTC 2012 - fcrozat@suse.com
|
||||
|
||||
- Fix build with new systemd / udev location.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com
|
||||
|
||||
|
@ -96,7 +96,8 @@ make %{?_smp_mflags} all V=1
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
rm -rf $RPM_BUILD_ROOT/usr/[^l]* $RPM_BUILD_ROOT/[^u]* $RPM_BUILD_ROOT/%{_libdir}/[^g]*
|
||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/*bluetooth* $RPM_BUILD_ROOT/usr/include
|
||||
rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/*bluetooth* $RPM_BUILD_ROOT/usr/include
|
||||
rm -rf $RPM_BUILD_ROOT/usr/lib/udev $RPM_BUILD_ROOT/usr/lib/systemd
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/*/*.la
|
||||
|
||||
%clean
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com
|
||||
|
||||
- Change udev rules location with udev > 190
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com
|
||||
|
||||
|
10
bluez.spec
10
bluez.spec
@ -68,6 +68,11 @@ Requires: libbluetooth3 = %{version}
|
||||
%define OLD_UDEV 1
|
||||
%else
|
||||
%define OLD_UDEV 0
|
||||
%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
|
||||
%define NEW_UDEV 1
|
||||
%else
|
||||
%define NEW_UDEV 0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
|
||||
@ -358,8 +363,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_sbindir}/bluetoothd
|
||||
#%{_sbindir}/hid2hci
|
||||
%{_sbindir}/bccmd
|
||||
%if 0%{NEW_UDEV}
|
||||
%dir /usr/lib/udev
|
||||
/usr/lib/udev/*
|
||||
%else
|
||||
%dir /lib/udev
|
||||
/lib/udev/*
|
||||
%endif
|
||||
%if 0%{OLD_UDEV}
|
||||
%dir %{_sysconfdir}/udev/rules.d
|
||||
%config %{_sysconfdir}/udev/rules.d/*
|
||||
|
Loading…
Reference in New Issue
Block a user