SHA256
1
0
forked from pool/bluez

Accepting request 37966 from Base:System

checked in (request 37966)

OBS-URL: https://build.opensuse.org/request/show/37966
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=48
This commit is contained in:
OBS User autobuild 2010-04-15 21:52:08 +00:00 committed by Git OBS Bridge
parent ba13d51a7e
commit 4602c68be8
3 changed files with 3 additions and 34 deletions

View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Wed Apr 14 15:32:51 CEST 2010 - jsmeix@suse.de
- In openSUSE 11.3 there is upstream compliant CUPS 1.4
which means to have a fixed "/usr/lib/cups/" directory
on all platforms (see Novell/Suse Bugzilla bnc#575544).
-------------------------------------------------------------------
Fri Mar 26 07:20:13 UTC 2010 - seife@opensuse.org

View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Wed Apr 14 15:32:51 CEST 2010 - jsmeix@suse.de
- In openSUSE 11.3 there is upstream compliant CUPS 1.4
which means to have a fixed "/usr/lib/cups/" directory
on all platforms (see Novell/Suse Bugzilla bnc#575544).
-------------------------------------------------------------------
Fri Mar 26 07:20:13 UTC 2010 - seife@opensuse.org

View File

@ -49,14 +49,6 @@ Requires: libbluetooth3 = %{version}
%else
%define OLD_UDEV 0
%endif
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
# which means to have a fixed "/usr/lib/cups/" directory
# on all platforms (see Novell/Suse Bugzilla bnc#575544):
%if 0%{?suse_version} > 1120
%define cups_lib_dir %{_prefix}/lib/cups
%else
%define cups_lib_dir %{_libdir}/cups
%endif
%description
The Bluetooth stack for Linux.
@ -235,15 +227,6 @@ install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldpl
install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
# which means to have a fixed "/usr/lib/cups/" directory
# on all platforms (see Novell/Suse Bugzilla bnc#575544):
if ! test -e %{buildroot}%{cups_lib_dir}/backend/bluetooth
then if test -e %{buildroot}%{_libdir}/cups/backend/bluetooth
then mkdir -p %{buildroot}%{cups_lib_dir}/backend
mv %{buildroot}%{_libdir}/cups/backend/bluetooth %{buildroot}%{cups_lib_dir}/backend/bluetooth
fi
fi
%clean
rm -rf $RPM_BUILD_ROOT
@ -324,9 +307,9 @@ rm -rf $RPM_BUILD_ROOT
%files cups
%defattr(-,root,root)
%dir %{cups_lib_dir}
%dir %{cups_lib_dir}/backend
%{cups_lib_dir}/backend/bluetooth
%dir %{_libdir}/cups
%dir %{_libdir}/cups/backend
%{_libdir}/cups/backend/bluetooth
#%doc %{_defaultdocdir}/bluez-cups
%files test