From c1523b4fbea131ea84524e7667ddbf290ba08e3589497c8f118540800b25f9d4 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 14 Apr 2010 14:42:46 +0000 Subject: [PATCH 1/4] Accepting request 37938 from home:jsmeix:branches:Base:System 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 --- bluez.changes | 7 +++++++ bluez.spec | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/bluez.changes b/bluez.changes index ceadaab..baf6af7 100644 --- a/bluez.changes +++ b/bluez.changes @@ -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 diff --git a/bluez.spec b/bluez.spec index 52ace52..7401179 100644 --- a/bluez.spec +++ b/bluez.spec @@ -49,6 +49,14 @@ 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. @@ -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=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 @@ rm -rf $RPM_BUILD_ROOT %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 From ba13d51a7e3a8d481650a3bc940a6adb64931bd06defafb41b301596ee3b5ba0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 14 Apr 2010 14:49:23 +0000 Subject: [PATCH 2/4] sync bluez-gstreamer.changes and bluez.changes (they are always identical, no matter if the change applies to bluez-gstreamer as well, since the packages are only split to avoid a circular dependency) OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=47 --- bluez-gstreamer.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index ceadaab..baf6af7 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -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 From 4602c68be88b610141ccb1978d706661a518d95d1e24a3a98bf81ab7b1a7da32 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 21:52:08 +0000 Subject: [PATCH 3/4] 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 --- bluez-gstreamer.changes | 7 ------- bluez.changes | 7 ------- bluez.spec | 23 +++-------------------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index baf6af7..ceadaab 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -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 diff --git a/bluez.changes b/bluez.changes index baf6af7..ceadaab 100644 --- a/bluez.changes +++ b/bluez.changes @@ -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 diff --git a/bluez.spec b/bluez.spec index 7401179..52ace52 100644 --- a/bluez.spec +++ b/bluez.spec @@ -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 From 77011e10631eaf8078f6a35bba3d1dbd8050eddb04a35f313cb07ca457712796 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 15 Apr 2010 21:52:09 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/bluez revision 53.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=4b602d8898f4a2bb7131792c143ec02a --- bluez-gstreamer.changes | 7 +++++++ bluez-gstreamer.spec | 2 +- bluez.changes | 7 +++++++ bluez.spec | 25 +++++++++++++++++++++---- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes index ceadaab..baf6af7 100644 --- a/bluez-gstreamer.changes +++ b/bluez-gstreamer.changes @@ -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 diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec index 20d4f17..9175ef1 100644 --- a/bluez-gstreamer.spec +++ b/bluez-gstreamer.spec @@ -25,7 +25,7 @@ BuildRequires: alsa-devel libsndfile-devel pkg-config udev 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+ diff --git a/bluez.changes b/bluez.changes index ceadaab..baf6af7 100644 --- a/bluez.changes +++ b/bluez.changes @@ -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 diff --git a/bluez.spec b/bluez.spec index 52ace52..fb738e7 100644 --- a/bluez.spec +++ b/bluez.spec @@ -24,7 +24,7 @@ BuildRequires: glib2-devel libnl-devel libusb-devel 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 @@ 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. @@ -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=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 @@ rm -rf $RPM_BUILD_ROOT %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