Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at Thu Apr 15 23:52:06 CEST 2010. -------- --- bluez/bluez-gstreamer.changes 2010-03-26 08:47:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/bluez/bluez-gstreamer.changes 2010-04-14 16:49:22.000000000 +0200 @@ -1,0 +2,7 @@ +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). + +------------------------------------------------------------------- bluez.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.YoSheM/_old 2010-04-15 23:50:56.000000000 +0200 +++ /var/tmp/diff_new_pack.YoSheM/_new 2010-04-15 23:50:56.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel Url: http://www.bluez.org Version: 4.63 -Release: 1 +Release: 2 Summary: Bluetooth Sound Support Group: Productivity/Multimedia/Sound/Utilities License: GPLv2+ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.YoSheM/_old 2010-04-15 23:50:56.000000000 +0200 +++ /var/tmp/diff_new_pack.YoSheM/_new 2010-04-15 23:50:56.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: alsa-devel libsndfile-devel pkg-config udev Url: http://www.bluez.org Version: 4.63 -Release: 1 +Release: 2 Summary: Bluetooth Stack for Linux Group: Hardware/Mobile License: GPLv2+ @@ -49,6 +49,14 @@ %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. @@ -227,6 +235,15 @@ 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 @@ -307,9 +324,9 @@ %files cups %defattr(-,root,root) -%dir %{_libdir}/cups -%dir %{_libdir}/cups/backend -%{_libdir}/cups/backend/bluetooth +%dir %{cups_lib_dir} +%dir %{cups_lib_dir}/backend +%{cups_lib_dir}/backend/bluetooth #%doc %{_defaultdocdir}/bluez-cups %files test ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org