From 4f91b639252b5152e998133bf986ceb2cdda3be9 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:25:47 +0000 Subject: auto-import changelog data from sip-3.5-2.src.rpm Wed Jan 22 2003 Tim Powers - rebuilt Wed Dec 11 2002 Than Ngo 3.5-1 - 3.5 release Mon Nov 18 2002 Than Ngo 3.5-0.20021114.1 - update RC, which supports qt 3.1.0 - fix dependency problem with python Thu Nov 07 2002 Than Ngo 3.4-4 - update to 3.4 --- diff --git a/.cvsignore b/.cvsignore index cc878a6..03528ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sip-3.3.2.tar.gz +sip-x11-gpl-3.5.tar.gz diff --git a/sip.spec b/sip.spec index c28c5e1..ffbe16c 100644 --- a/sip.spec +++ b/sip.spec @@ -1,40 +1,61 @@ +%define build_release 0 +%define build_beta 1 +%define build_snapshot 2 + %define pythonver 2.2 %define pythonsitedir %{_libdir}/python%{pythonver}/site-packages -%define beta_version rc4 -%define is_release 1 -%define qtver 3.0.5 + +%define isBuild %{build_release} + +%define release_number 2 + +%define qtver 3.1.0 %define qtpkg qt + Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 3.3.2 -%if %{is_release} -Release: 4 -%else -Release: 0.%{beta_version}.1 -%endif +Version: 3.5 License: GPL Group: Development/Tools -%if %{is_release} -Source: http://www.riverbankcomputing.co.uk/download/sip/sip-%{version}.tar.gz -%else -Source: http://www.riverbankcomputing.co.uk/download/sip/sip-%{version}%{beta_version}.tar.gz +Url: http://www.riverbankcomputing.co.uk/ + +%if "%{isBuild}" == "%{build_release}" +%define release_name %{nil} +Release: %{release_number} +Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-x11-gpl-%{version}.tar.gz +%endif + +%if "%{isBuild}" == "%{build_beta}" +%define release_name rc +Release: 1.%{release_name}.%{release_number} +Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-x11-gpl-%{release_name}-%{version}.tar.gz %endif + +%if "%{isBuild}" == "%{build_snapshot}" +%define release_name 20021114 +Release: 1.%{release_name}.%{release_number} +Source: http://www.riverbankcomputing.co.uk/download/sip/%{name}-x11-gpl-snapshot-%{release_name}.tar.gz +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-root -Url: http://www.riverbankcomputing.co.uk/ + Prereq: /sbin/ldconfig + %if "%{pythonver}" == "2.2" %define pythonpkg python %define pythonprog /usr/bin/python2.2 -%define minor .1 +%define minor .2 %else %define pythonpkg python %define pythonprog /usr/bin/python %define minor .2 %endif -BuildPrereq: %{pythonpkg} == %{pythonver}%{minor} + +BuildPrereq: %{pythonpkg} >= %{pythonver}%{minor} BuildPrereq: %{qtpkg}-devel >= %{qtver} BuildPrereq: sed -Requires: %{pythonpkg} == %{pythonver}%{minor} + +Requires: %{pythonpkg} >= %{pythonver}%{minor} %description SIP is a tool for generating bindings for C++ classes so that they can be @@ -50,26 +71,30 @@ class library. %package devel Summary: Files needed to generate Python bindings for any C++ class library Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description devel This package contains files needed to generate Python bindings for any C++ classes library. %prep -%if %{is_release} -%setup -q -%else -%setup -q -n %{name}-%{version}%{beta_version} +rm -rf $RPM_BUILD_ROOT +%if "%{isBuild}" == "%{build_release}" +%setup -q -n %{name}-x11-gpl-%{version} +%endif +%if "%{isBuild}" == "%{build_beta}" +%setup -q -n %{name}-x11-gpl-%{version} +%endif +%if "%{isBuild}" == "%{build_snapshot}" +%setup -q -n %{name}-x11-gpl-snapshot-%{release_name} %endif %build -rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}%{pythonsitedir} \ %{buildroot}%{_bindir} QTDIR="" && source /etc/profile.d/qt.sh -%pythonprog build.py \ +echo yes | %pythonprog build.py \ -l qt-mt \ -b %{buildroot}%{_bindir} \ -d %{buildroot}%{pythonsitedir} @@ -101,6 +126,19 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/python%{pythonver}/* %changelog +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Dec 11 2002 Than Ngo 3.5-1 +- 3.5 release + +* Mon Nov 18 2002 Than Ngo 3.5-0.20021114.1 +- update RC, which supports qt 3.1.0 +- fix dependency problem with python + +* Thu Nov 7 2002 Than Ngo 3.4-4 +- update to 3.4 + * Wed Aug 28 2002 Than Ngo 3.3.2-4 - rpath issue diff --git a/sources b/sources index d9663fe..e361028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -161c28f0bd3ef755ac44d4e39088c3be sip-3.3.2.tar.gz +5a3a598a25316aa947b79703678b18b5 sip-x11-gpl-3.5.tar.gz