rpm/bluez
SHA256
1
0
Fork 0
forked from pool/bluez
Code Pull Requests Activity

Accepting request 37938 from home:jsmeix:branches:Base:System

Browse Source 
Copy from home:jsmeix:branches:Base:System/bluez via accept of submit request 37938 revision 3.
Request was accepted with message:
Looks good. I trust you on that, Johannes ;)

OBS-URL: https://build.opensuse.org/request/show/37938
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=46
This commit is contained in:
Stefan Seyfried 2010-04-14 14:42:46 +00:00 committed by Git OBS Bridge
parent 9f5943405f
commit c1523b4fbe
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluez.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Fri Mar 26 07:20:13 UTC 2010 - seife@opensuse.org

23
bluez.spec
View File

@ -49,6 +49,14 @@ Requires: libbluetooth3 = %{version}
%else %else
%define OLD_UDEV 0 %define OLD_UDEV 0
%endif %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 %description
The Bluetooth stack for Linux. The Bluetooth stack for Linux.
@ -227,6 +235,15 @@ 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=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=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 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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -307,9 +324,9 @@ rm -rf $RPM_BUILD_ROOT
%files cups %files cups
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_libdir}/cups %dir %{cups_lib_dir}
%dir %{_libdir}/cups/backend %dir %{cups_lib_dir}/backend
%{_libdir}/cups/backend/bluetooth %{cups_lib_dir}/backend/bluetooth
#%doc %{_defaultdocdir}/bluez-cups #%doc %{_defaultdocdir}/bluez-cups
%files test %files test