[python-pyside/f13/master] Update to 1.0.0

Kalev Lember kalev at fedoraproject.org
Thu Mar 3 18:09:37 UTC 2011


commit 766af1d3e1769dc17b7c03d4b83055d33816e63e
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Mar 3 19:28:35 2011 +0200

    Update to 1.0.0

 .gitignore                           |    1 +
 python-pyside-disable_xvfb-run.patch |   12 ------------
 python-pyside-release-type.patch     |   14 --------------
 python-pyside.spec                   |   30 +++++++++++++++---------------
 sources                              |    2 +-
 5 files changed, 17 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2312e85..4e242a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pyside-qt4.6+0.4.1.tar.bz2
+/pyside-qt4.7+1.0.0.tar.bz2
diff --git a/python-pyside.spec b/python-pyside.spec
index 06ed7b7..0302f37 100644
--- a/python-pyside.spec
+++ b/python-pyside.spec
@@ -1,19 +1,14 @@
 %global runtests 1
 
 Name:           python-pyside
-Version:        0.4.1
-Release:        3%{?dist}
+Version:        1.0.0
+Release:        1%{?dist}
 Summary:        Python bindings for Qt4
 
 Group:          Development/Languages
 License:        LGPLv2
 URL:            http://www.pyside.org
-Source0:        http://www.pyside.org/files/pyside-qt4.6+%{version}.tar.bz2
-# Don't override cmake release type to avoid -O3 optimization level
-Patch0:         python-pyside-release-type.patch
-# Don't use xvfb-run which is currently broken in Fedora
-# https://bugzilla.redhat.com/show_bug.cgi?id=632879
-Patch1:         python-pyside-disable_xvfb-run.patch
+Source0:        http://www.pyside.org/files/pyside-qt4.7+%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -26,6 +21,8 @@ BuildRequires:  shiboken-devel
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  xorg-x11-xauth
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+
 # Don't want provides for python shared objects
 %{?filter_provides_in: %filter_provides_in %{python_sitearch}/PySide/.*\.so}
 %{?filter_setup}
@@ -53,19 +50,16 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n pyside-qt4.6+%{version}
+%setup -q -n pyside-qt4.7+%{version}
 
 # Fix up unit tests to use lrelease-qt4
 sed -i -e "s/lrelease /lrelease-qt4 /" tests/QtCore/translation_test.py
 
-%patch0 -p1 -b .release_type
-%patch1 -p1 -b .disable_xvfb-run
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} -DCMAKE_SKIP_RPATH=true ..
+%{cmake} -DCMAKE_SKIP_RPATH=true -DCMAKE_BUILD_TYPE=Release ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -104,19 +98,25 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING PySide/licensecomment.txt
-%{_libdir}/libpyside.so.*
+%{_libdir}/libpyside*.so.*
 %{python_sitearch}/PySide/
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/PySide/
-%{_libdir}/libpyside.so
+%{_libdir}/libpyside*.so
 %{_libdir}/cmake/PySide-%{version}/
 %{_libdir}/pkgconfig/pyside.pc
 %{_datadir}/PySide/
 
 
 %changelog
+* Thu Mar 03 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.0-1
+- Update to 1.0.0
+- Dropped upstreamed patches
+- Force Release build type to make sure NDEBUG is defined
+- Require Qt version greater or equal than the package was built with
+
 * Sat Oct 02 2010 Kalev Lember <kalev at smartlink.ee> - 0.4.1-3
 - Re-enabled phonon bindings
 
diff --git a/sources b/sources
index e5d948d..d2f5ede 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dbc34efa904458f792df128df738d554  pyside-qt4.6+0.4.1.tar.bz2
+5589a883cebcb799a48b184a46db6386  pyside-qt4.7+1.0.0.tar.bz2


More information about the scm-commits mailing list