From af023e2bc2c837e9ff227acc87d4625a14004d25 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:25:44 +0000 Subject: auto-import changelog data from sip-3.3.2-4.src.rpm Wed Aug 28 2002 Than Ngo 3.3.2-4 - rpath issue --- diff --git a/sip.spec b/sip.spec index 68fa58b..c28c5e1 100644 --- a/sip.spec +++ b/sip.spec @@ -1,4 +1,5 @@ %define pythonver 2.2 +%define pythonsitedir %{_libdir}/python%{pythonver}/site-packages %define beta_version rc4 %define is_release 1 %define qtver 3.0.5 @@ -7,7 +8,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 3.3.2 %if %{is_release} -Release: 3 +Release: 4 %else Release: 0.%{beta_version}.1 %endif @@ -32,6 +33,7 @@ Prereq: /sbin/ldconfig %endif BuildPrereq: %{pythonpkg} == %{pythonver}%{minor} BuildPrereq: %{qtpkg}-devel >= %{qtver} +BuildPrereq: sed Requires: %{pythonpkg} == %{pythonver}%{minor} %description @@ -63,14 +65,17 @@ classes library. %build rm -rf $RPM_BUILD_ROOT -mkdir -p %{buildroot}%{_libdir}/python%{pythonver}/site-packages \ +mkdir -p %{buildroot}%{pythonsitedir} \ %{buildroot}%{_bindir} QTDIR="" && source /etc/profile.d/qt.sh %pythonprog build.py \ -l qt-mt \ -b %{buildroot}%{_bindir} \ - -d %{buildroot}%{_libdir}/python%{pythonver}/site-packages/ \ + -d %{buildroot}%{pythonsitedir} + +mv siplib/Makefile siplib/Makefile.orig +sed -e "s#-rpath,.*site-packages*#-rpath,%{pythonsitedir}#" siplib/Makefile.orig >siplib/Makefile make %{?_smp_mflags} @@ -88,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc ChangeLog LICENSE NEWS README THANKS -%{_libdir}/python%{pythonver}/site-packages/*.so* +%{pythonsitedir}/*.so* %{_bindir}/* %files devel @@ -96,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/python%{pythonver}/* %changelog +* Wed Aug 28 2002 Than Ngo 3.3.2-4 +- rpath issue + * Mon Aug 26 2002 Than Ngo 3.3.2-3 - rebuild against new qt