rpms/pyorbit/devel pyorbit.spec,1.22,1.23

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/pyorbit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26422

Modified Files:
	pyorbit.spec 
Log Message:

* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-2.fc7
- Fix some file permissions (RH bug #236738).
- Spec file cleanups.



Index: pyorbit.spec
===================================================================
RCS file: /cvs/dist/rpms/pyorbit/devel/pyorbit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pyorbit.spec	25 Feb 2007 21:28:59 -0000	1.22
+++ pyorbit.spec	17 Apr 2007 14:45:00 -0000	1.23
@@ -1,25 +1,35 @@
-%define python python2
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+### Abstract ###
 
-Summary: Python bindings for ORBit2.
 Name: pyorbit
 Version: 2.14.2
-Release: 1
+Release: 2%{?dist}
 License: LGPL
 Group: Development/Languages
-Source: %{name}-%{version}.tar.bz2
+Summary: Python bindings for ORBit2.
 BuildRoot: %{_tmppath}/%{name}-root
+Source: %{name}-%{version}.tar.bz2
+
+Obsoletes: orbit-python
+
+### Dependencies ###
+
 Requires: ORBit2 >= 2.3.103
-Requires: libIDL >= 0.8.0
 Requires: glib2 >= 2.4.0
-Requires: %{python} >= 2.3
-Buildrequires: %{python}-devel >= 2.3
-Buildrequires: ORBit2-devel >= 2.6.0
-Buildrequires: libIDL-devel >= 0.8.0
-Buildrequires: glib2-devel >= 2.4.0
+Requires: libIDL >= 0.8.0
+Requires: python2 >= 2.3
+
+### 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: libtool
 BuildRequires: pygtk2 >= 2.4.0
-Obsoletes: orbit-python
-# needed for automake/autoconf to work right with multilib python
-Buildrequires: automake >= 1.6.3-5, autoconf, libtool
+BuildRequires: python2-devel >= 2.3
 
 %description
 pyorbit is an extension module for python that gives you access
@@ -36,10 +46,9 @@
 libraries so that they interoperate with pyorbit
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
 %build
-#[ -x /usr/bin/python2.2 ] && export PYTHON=/usr/bin/python2.2
 %configure
 make
 
@@ -52,20 +61,24 @@
 rm -fr $RPM_BUILD_ROOT
 
 %files
-%defattr(755, root, root, 755)
+%defattr(-, root, root)
 %doc AUTHORS NEWS README ChangeLog
-%{_libdir}/python?.?/site-packages/*.so
-%{_libdir}/python?.?/site-packages/*.py
-%{_libdir}/python?.?/site-packages/*.pyc
-%{_libdir}/python?.?/site-packages/*.pyo
 
-%files devel
 %defattr(755, root, root, 755)
-%dir %{_includedir}/pyorbit-2
-%{_includedir}/pyorbit-2/*.h
+%{python_sitearch}/*.so
+%defattr(644, root, root, 755)
+%{python_sitearch}/*.py*
+
+%files devel
+%defattr(644, root, root, 755)
+%{_includedir}/pyorbit-2
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-2.fc7
+- Fix some file permissions (RH bug #236738).
+- Spec file cleanups.
+
 * Sun Feb 25 2007 Matthew Barnes <mbarnes at redhat.com> - 2.14.2-1.fc7
 - Update to 2.14.2