[libbtctl] - clean-up due to Packaging:ReviewGuidelines (#225991) - update package summary and description - fi

Thu Oct 21 15:13:50 UTC 2010

commit 0e991c08ac20bb1539f1eaefe4b3188d918d336e
Author: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
Date:   Thu Oct 21 17:13:04 2010 +0200

    - clean-up due to Packaging:ReviewGuidelines (#225991)
    - update package summary and description
    - fix package license
    - fix mono bindings BuildRequires dependencies
    - fix parallel installation target order in mono subdir

 libbtctl-0.11.1-fix-parallel-install.patch |   36 ++++++++++++++++++
 libbtctl.spec                              |   54 +++++++++++++++++-----------
 2 files changed, 69 insertions(+), 21 deletions(-)
---

diff --git a/libbtctl-0.11.1-fix-parallel-install.patch b/libbtctl-0.11.1-fix-parallel-install.patch
new file mode 100644
index 0000000..290ed90
--- /dev/null
+++ b/libbtctl-0.11.1-fix-parallel-install.patch
@@ -0,0 +1,36 @@
+From 9dc7c225d0b25cf9fc08f063705507afe6b60c6f Mon Sep 17 00:00:00 2001
+From: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
+Date: Wed, 20 Oct 2010 14:43:23 +0200
+Subject: [PATCH] Fix parallel installation target order
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use install-data-hook instead of install-data-local in Makefile.am to guarantee dependency on install-data (so we can be sure btctl.dll library has been already created).
+
+Quoting automake manual:
+> With the `-local' targets, there is no particular guarantee of execution
+> order; typically, they are run early, but with parallel make, there is no
+> way to be sure of that.
+
+Based on fix in gmime by Diego Elio “Flameeyes” Pettenò.
+---
+ mono/libbtctl/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mono/libbtctl/Makefile.am b/mono/libbtctl/Makefile.am
+index 19c506c..11dcb69 100644
+--- a/mono/libbtctl/Makefile.am
++++ b/mono/libbtctl/Makefile.am
+@@ -63,7 +63,7 @@ btobex.exe: $(srcdir)/btobex.cs btctl.dll
+ btobexclient.exe: $(srcdir)/btobexclient.cs btctl.dll
+ 	$(MCS) $(srcdir)/btobexclient.cs -out:btobexclient.exe -r:btctl.dll -pkg:gtk-sharp-2.0
+ 
+-install-data-local:
++install-data-hook:
+ 	if test -n '$(TARGET)'; then \
+ 		$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(MONO_INSTDIR)/lib || exit 1; \
+ 	fi
+-- 
+1.7.2.3
+
diff --git a/libbtctl.spec b/libbtctl.spec
index c72c3f8..dade044 100644
--- a/libbtctl.spec
+++ b/libbtctl.spec
@@ -1,32 +1,38 @@
-%ifarch %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
-# defined to zero, because beehive doesn't do macros for BuildRequires
-%define with_mono 0
-%else
-%define with_mono 0
-%endif
-ExcludeArch: s390 s390x
-Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.11.1
-Release: 6%{?dist}
-License: GPL+
+Release: 7%{?dist}
+Summary: GObject wrapper library for the GNOME Bluetooth Subsystem
+
 Group: System Environment/Libraries
+License: GPLv2+ and LGPLv2.1+
 URL: http://live.gnome.org/GnomeBluetooth 
 Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.11/%{name}-%{version}.tar.bz2
 
+ExcludeArch: s390 s390x
+
 BuildRequires: autoconf, bluez-libs-devel, glib2-devel, gtk-doc
-BuildRequires: openobex-devel , pygtk2-devel, gtk2-devel
+BuildRequires: openobex-devel, pygtk2-devel, gtk2-devel
 BuildRequires: python, python-devel, gettext, automake, libtool, intltool
 
+# mono bindings
+%ifarch %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
+# FIXME: Set to zero until bindings sign process and files installation is fixed
+%define with_mono 0
+%else
+%define with_mono 0
+%endif
 %if %{with_mono}
-%{expand BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp}
+BuildRequires: mono-devel, gtk-sharp2-gapi
+BuildRequires: gtk-sharp2-devel >= 2.4.0
 %endif
 
-# Fedora specific patches
-
+# Fedora-specific patches
 Patch2: libbtctl-0.4.1-pydir.patch
 Patch3: libbtctl-libtool2.patch
 
+# until it's merged by upstream
+Patch4: libbtctl-0.11.1-fix-parallel-install.patch
+
 # we don't want to provide private python extension libs
 %{?filter_setup:
 %filter_provides_in %{python_sitearch}/.*\.so$ 
@@ -34,12 +40,13 @@ Patch3: libbtctl-libtool2.patch
 }
 
 %description
-Library for the GNOME Bluetooth Subsystem
+%{summary}
 
 %package devel
 Summary: Development files for libbtctl
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains the files needed for developing applications,
@@ -56,6 +63,7 @@ Group: Documentation
 %setup -q
 %patch2 -p1 -b .pydir
 %patch3 -p1 -b .libtool2
+%patch4 -p1 -b .parallel-install
 libtoolize
 aclocal
 automake -a
@@ -84,18 +92,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-, root, root,-)
+%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog NEWS README 
 %{_libdir}/lib*.so.*
 %{python_sitearch}/*btctl*
 %if %{with_mono}
-%{_libdir}/mono/gac/btctl/*/btctl.dll
 %{_libdir}/mono/libbtctl/btctl.dll
 %{_datadir}/gapi/btctl-api.xml
 %endif
 
 %files devel
-%defattr(-, root, root,-)
+%defattr(-, root, root, -)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
@@ -104,10 +111,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %endif
 
 %files doc
-%defattr(-, root, root,-)
+%defattr(-, root, root, -)
 %{_datadir}/gtk-doc/html/libbtctl
 
 %changelog
+* Thu Oct 21 2010 Vojtech Vitek (V-Teq) <vvitek at redhat.com> - 0.11.1-7
+- clean-up due to Packaging:ReviewGuidelines (#225991)
+- update package summary and description
+- fix package license
+- fix mono bindings BuildRequires dependencies
+- fix parallel installation target order in mono subdir
+
 * Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.11.1-6
 - Merge-review cleanup (#225991)
 
@@ -265,5 +279,3 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 * Wed Jun  5 2003 Harald Hoyer <harald at redhat.de> 0.3-1
 - initial RPM
-
-
