[libbtctl] - Merge-review cleanup (#225991)

[Vojtěch Vítek]

commit 6faf3a4f3044f6d6a8e529b4b48f75fc37e9f2db
Author: Vojtech Vitek (V-Teq) <vvitek at redhat.com>
Date:   Tue Oct 19 12:57:04 2010 +0200

    - Merge-review cleanup (#225991)

 libbtctl.spec |   47 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/libbtctl.spec b/libbtctl.spec
index 489d24a..c72c3f8 100644
--- a/libbtctl.spec
+++ b/libbtctl.spec
@@ -8,24 +8,31 @@ ExcludeArch: s390 s390x
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.11.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL+
 Group: System Environment/Libraries
 URL: http://live.gnome.org/GnomeBluetooth 
-Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.10/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.11/%{name}-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf >= 0:2.57, bluez-libs-devel, glib2-devel, gtk-doc
-BuildRequires: openobex-devel >= 0:1.1, pygtk2-devel, gtk2-devel
+BuildRequires: autoconf, bluez-libs-devel, glib2-devel, gtk-doc
+BuildRequires: openobex-devel , pygtk2-devel, gtk2-devel
 BuildRequires: python, python-devel, gettext, automake, libtool, intltool
 
 %if %{with_mono}
 %{expand BuildRequires: mono-devel gtk-sharp-gapi gtk-sharp}
 %endif
 
+# Fedora specific patches
+
 Patch2: libbtctl-0.4.1-pydir.patch
 Patch3: libbtctl-libtool2.patch
 
+# we don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_setup
+}
+
 %description
 Library for the GNOME Bluetooth Subsystem
 
@@ -33,7 +40,6 @@ Library for the GNOME Bluetooth Subsystem
 Summary: Development files for libbtctl
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel
 
 %description devel
 This package contains the files needed for developing applications,
@@ -41,7 +47,7 @@ which use libbtctl.
 
 %package doc
 Summary: Documentation files for libbtctl
-Group: Development/Documentation
+Group: Documentation
 
 %description doc
 %{summary}
@@ -57,7 +63,7 @@ intltoolize -c -f
 autoconf
 
 %build
-%configure \
+%configure --disable-static \
 %if %{with_mono}
 	;
 %else
@@ -68,30 +74,20 @@ autoconf
 make 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# we do not want .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/*.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %find_lang %name
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %doc AUTHORS ChangeLog NEWS README 
 %{_libdir}/lib*.so.*
-%{_libdir}/python?.?/site-packages/*btctl*
+%{python_sitearch}/*btctl*
 %if %{with_mono}
 %{_libdir}/mono/gac/btctl/*/btctl.dll
 %{_libdir}/mono/libbtctl/btctl.dll
@@ -99,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/libbtctl.pc
 %{_includedir}/libbtctl
@@ -108,10 +104,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %files doc
-%defattr(-, root, root)
+%defattr(-, root, root,-)
 %{_datadir}/gtk-doc/html/libbtctl
 
 %changelog
+* Mon Oct 18 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.11.1-6
+- Merge-review cleanup (#225991)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.11.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild