[pyorbit] Merge-review cleanup.

[Matthew Barnes]

commit bea0cc440a0c082df2ae0f33b3743aa06b5e9897
Author: Parag Nemade <paragn at fedoraproject.org>
Date:   Sun Oct 17 13:04:18 2010 -0400

    Merge-review cleanup.

 pyorbit.spec |   61 +++++++++++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 34 deletions(-)
---
diff --git a/pyorbit.spec b/pyorbit.spec
index 317e50b..e8a3075 100644
--- a/pyorbit.spec
+++ b/pyorbit.spec
@@ -1,45 +1,42 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 ### Abstract ###
 
 Name: pyorbit
 Version: 2.24.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: Development/Languages
-Summary: Python bindings for ORBit2.
-BuildRoot: %{_tmppath}/%{name}-root
+Summary: Python bindings for ORBit2
 Source0: http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/%{name}-%{version}.tar.bz2
 
-Obsoletes: orbit-python
-
 ### Dependencies ###
 
-Requires: ORBit2 >= 2.3.103
-Requires: glib2 >= 2.4.0
-Requires: libIDL >= 0.8.0
-Requires: python2 >= 2.3
+Requires: ORBit2
+Requires: glib2
+Requires: libIDL
+Requires: python2
 
 ### Build Dependencies ###
 
-BuildRequires: ORBit2-devel >= 2.6.0
-BuildRequires: autoconf
-BuildRequires: automake >= 1.6.3-5
-BuildRequires: glib2-devel >= 2.4.0
-BuildRequires: libIDL-devel >= 0.8.0
+BuildRequires: ORBit2-devel
+BuildRequires: glib2-devel
+BuildRequires: libIDL-devel
 BuildRequires: libtool
-BuildRequires: pygtk2 >= 2.4.0
-BuildRequires: python2-devel >= 2.3
+BuildRequires: python2-devel
+
+# We don't want to provide private python extension libs.
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_setup
+}
 
 %description
 pyorbit is an extension module for python that gives you access
 to the ORBit2 CORBA ORB.
 
 %package devel
-Summary: Files needed to build wrappers for ORBit2 addon libraries.
+Summary: Files needed to build wrappers for ORBit2 addon libraries
 Group: Development/Languages
-Obsoletes: orbit-python-devel
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 This package contains files required to build wrappers for ORBit2 addon
@@ -49,32 +46,28 @@ libraries so that they interoperate with pyorbit
 %setup -q -n %{name}-%{version}
 
 %build
-%configure
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
-
-%clean
-rm -fr $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} ';'
 
 %files
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS NEWS README ChangeLog
-
-%defattr(755, root, root, 755)
 %{python_sitearch}/*.so
-%defattr(644, root, root, 755)
 %{python_sitearch}/*.py*
 
 %files devel
-%defattr(644, root, root, 755)
+%defattr(-,root,root,-)
 %{_includedir}/pyorbit-2
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Sep 24 2010 Parag Nemade <paragn at fedoraproject.org> - 2.24.0-7
+- Merge-review cleanup (#226336)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.24.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild