- merged updates (sic) from RA-branch (but up to 3.7)

Changed files:
    sip.spec -> 1.21

diff --git a/sip.spec b/sip.spec
index f6edab4867db610a54242fe9eca4d476c219fb9d..0f006ac4360c102da67105f8cd12c45362a27cfb 100644 (file)
--- a/sip.spec
+++ b/sip.spec
@@ -1,20 +1,25 @@
+# TODO:
+# - %build shouldn't use $RPM_BUILD_ROOT
+# - libsip.so.* is built with evil RPATH (inside buildroot)
 %include        /usr/lib/rpm/macros.python
 Summary:       Python bindings generator for C++ class libraries
 Summary(pl):   Generator powi±zañ Pythona z bibliotekami klas C++
 Name:          sip
-Version:       3.5
-Release:       1
+Version:       3.7
+Release:       0.1
 License:       GPL
 Group:         Development/Languages/Python
 Source0:       http://www.river-bank.demon.co.uk/download/sip/%{name}-x11-gpl-%{version}.tar.gz
-# Source0-md5: 5a3a598a25316aa947b79703678b18b5
+# Source0-md5: f186952fe88097caa3b25503e3583ce7
 URL:           http://www.riverbankcomputing.co.uk/sip/index.php
-BuildRequires: python >= 2.2
-BuildRequires: qt-devel
+BuildRequires: python-devel >= 2.2
+BuildRequires: qt-devel >= 3.1.2
 BuildRequires: rpm-pythonprov
 %pyrequires_eq python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sipfilesdir    %{_datadir}/sip
+
 %description
 Generates Python bindings for C++ class libraries from a set of class
 specification files. Also includes a runtime support library needed by
@@ -40,7 +45,7 @@ echo 'yes' | python build.py \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{py_sitedir},%{py_incdir}}
+install -d $RPM_BUILD_ROOT{%{py_sitedir},%{py_incdir},%{_sipfilesdir}}
 
 %{__make} install
 
@@ -53,3 +58,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{py_sitedir}/lib*.*
 %{py_incdir}/*.h
+%dir %{_sipfilesdir}