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

Kalev Lember kalev at fedoraproject.org
Thu Mar 3 18:01:04 UTC 2011


commit 9853f8e09f5c62c47c3f8401160f5cd0ace92d40
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-phonon-videocapturedevice.patch |   73 -------------------------
 python-pyside-release-type.patch              |   14 -----
 python-pyside.spec                            |   30 ++++------
 sources                                       |    2 +-
 6 files changed, 14 insertions(+), 118 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 ebe38d7..c41f5a2 100644
--- a/python-pyside.spec
+++ b/python-pyside.spec
@@ -1,21 +1,14 @@
 %global runtests 1
 
 Name:           python-pyside
-Version:        0.4.1
-Release:        4%{?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
-# Fix build with Phonon 4.4.3 and newer
-Patch2:         python-pyside-phonon-videocapturedevice.patch
+Source0:        http://www.pyside.org/files/pyside-qt4.7+%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -57,20 +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
-%patch2 -p1 -b .phonon-videocapturedevice
-
 
 %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}
@@ -109,19 +98,24 @@ 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
+
 * Tue Feb 08 2011 Kalev Lember <kalev at smartlink.ee> - 0.4.1-4
 - Rebuilt for ABI changes in Qt 4.7.1
 - Require Qt version greater or equal than the package was built with
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