Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2013-03-01 07:13:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez-gstreamer.changes 2013-01-22 14:59:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez-gstreamer.changes 2013-03-01 07:13:37.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Feb 28 14:45:10 UTC 2013 - [email protected] + +- add bluez-4.101-new-automake.diff, fix build with automake-1.13.1 + +------------------------------------------------------------------- +Fri Jan 25 08:05:27 UTC 2013 - [email protected] + +- also run spec-cleaner on bluez-gstreamer.spec, add README for + packagers, fix bluez-gstreamer changelog + +------------------------------------------------------------------- +Mon Jan 21 11:16:34 UTC 2013 - [email protected] + +- Unconditionally enable the systemd bluetooth service (actual + activation of bluez is triggered by udev) (bnc#796671). +- Run spec-cleaner. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2013-01-29 10:27:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2013-03-01 07:13:37.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 28 14:45:10 UTC 2013 - [email protected] + +- add bluez-4.101-new-automake.diff, fix build with automake-1.13.1 + +------------------------------------------------------------------- +Fri Jan 25 08:05:27 UTC 2013 - [email protected] + +- also run spec-cleaner on bluez-gstreamer.spec, add README for + packagers, fix bluez-gstreamer changelog + +------------------------------------------------------------------- New: ---- README.packagers bluez-4.101-new-automake.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.x2JcLe/_old 2013-03-01 07:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.x2JcLe/_new 2013-03-01 07:13:38.000000000 +0100 @@ -18,17 +18,27 @@ Name: bluez-gstreamer -BuildRequires: dbus-1-devel >= 1.4 BuildRequires: flex BuildRequires: libcap-ng-devel +BuildRequires: pkgconfig(dbus-1) >= 1.4 %if 0%{?suse_version} > 1130 BuildRequires: pkgconfig(systemd) %endif +Version: 4.101 +Release: 0 +Summary: Bluetooth Sound Support +License: GPL-2.0+ +Group: Productivity/Multimedia/Sound/Utilities +Url: http://www.bluez.org +Source: bluez-%{version}.tar.bz2 +Source3: bluetooth.sysconfig +Source6: README.SUSE +Source99: README.packagers +# fix for new automake, will not go upstream (upstream is at bluez-5) +Patch1: bluez-4.101-new-automake.diff BuildRequires: alsa-devel BuildRequires: automake BuildRequires: check-devel -BuildRequires: glib2-devel >= 2.28 -BuildRequires: gstreamer-0_10-devel BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libsndfile-devel BuildRequires: libtool @@ -37,19 +47,12 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: udev +BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(libnl-1) -Url: http://www.bluez.org -Version: 4.101 -Release: 0 -Summary: Bluetooth Sound Support -License: GPL-2.0+ -Group: Productivity/Multimedia/Sound/Utilities -Source: bluez-%{version}.tar.bz2 -Source3: bluetooth.sysconfig -Source6: README.SUSE -BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libbluetooth3 = %{version} -Provides: bluez-audio:%_libdir/gstreamer-0.10/libgstbluetooth.so +Provides: bluez-audio:%{_libdir}/gstreamer-0.10/libgstbluetooth.so +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %( echo `rpm -q --queryformat %%{version} udev` ) < 144 %define OLD_UDEV 1 %else @@ -61,16 +64,10 @@ The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - -Authors: --------- - Marcel Holtmann <[email protected]> - and others, see AUTHORS in the documentation of the "bluez" package. - %prep %setup -n bluez-%{version} -q -cp %{S:6} . +%patch1 -p1 +cp %{SOURCE6} . %build autoreconf -fiv @@ -94,14 +91,14 @@ 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/usr/lib/udev $RPM_BUILD_ROOT/usr/lib/systemd -rm $RPM_BUILD_ROOT/%{_libdir}/*/*.la +%make_install +rm -rf %{buildroot}%{_prefix}/[^l]* %{buildroot}/[^u]* %{buildroot}/%{_libdir}/[^g]* +rm -rf %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/%{_libdir}/*bluetooth* %{buildroot}%{_prefix}/include +rm -rf %{buildroot}%{_prefix}/lib/udev %{buildroot}%{_prefix}/lib/systemd +rm %{buildroot}/%{_libdir}/*/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-, root, root) ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.x2JcLe/_old 2013-03-01 07:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.x2JcLe/_new 2013-03-01 07:13:38.000000000 +0100 @@ -38,8 +38,11 @@ Source5: baselibs.conf Source6: README.SUSE Source7: bluetooth.modprobe +Source99: README.packagers # already fixed upstream Patch0: 0001-network-fix-network-Connect-method-parameters.patch +# fix for new automake, will not go upstream (upstream is at bluez-5) +Patch1: bluez-4.101-new-automake.diff BuildRequires: alsa-devel BuildRequires: automake BuildRequires: check-devel @@ -149,6 +152,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp %{SOURCE6} . mkdir dbus-apis cp -a doc/*.txt dbus-apis/ ++++++ README.packagers ++++++ Hi all, bluez and bluez-gstreamer are just split in order to avoid cyclic build dependencies. If you are changing bluez.spec, consider also adapting bluez-gstreamer.spec so that the diff remains more or less the same. Especially, bluez-gstreamer.changes should always be identical to bluez.changes. Thanks for considering :-) seife ++++++ bluez-4.101-new-automake.diff ++++++ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.60) AC_INIT(bluez, 4.101) AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_MAINTAINER_MODE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
