rpms/qzion/F-10 qzion-0.4.0-fix_char_conversion.patch, NONE, 1.1 qzion.spec, 1.2, 1.3

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qzion/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6024

Modified Files:
	qzion.spec 
Added Files:
	qzion-0.4.0-fix_char_conversion.patch 
Log Message:
* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-5
- -python: Requires: sip-api(%_sip_api_major) >= %_sip_api


qzion-0.4.0-fix_char_conversion.patch:
 qzionobject.sip |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE qzion-0.4.0-fix_char_conversion.patch ---
--- a/python/qzion/qzionobject.sip
+++ b/python/qzion/qzionobject.sip
@@ -10,7 +10,7 @@
 
 %ConvertToSubClassCode
     static struct classes {
-        char *name;
+        const char *name;
         sipWrapperType **type;
     } cls[] = {
         {sipName_QZionText, &sipClass_QZionText},


Index: qzion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qzion/F-10/qzion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qzion.spec	13 Jun 2009 18:19:11 -0000	1.2
+++ qzion.spec	17 Nov 2009 16:11:22 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           qzion
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        A canvas abstraction
 
 Group:          System Environment/Libraries
@@ -13,15 +13,16 @@ URL:            http://code.openbossa.or
 Source0:        http://code.openbossa.org/projects/%{name}/repos/mainline/archive/d32223eae1bba7f1b191c334668f3f7dd662f582.tar.gz
 
 Patch0:         qzion-0.4.0-fix_python_install.patch
+Patch1:		qzion-0.4.0-fix_char_conversion.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel
+BuildRequires:  sip-devel
 BuildRequires:  PyQt4-devel
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
-BuildRequires:  sip-devel
 
 %description
 QZion is an canvas abstraction used by and made for QEdje.
@@ -43,16 +44,16 @@ developing applications that use %{name}
 Summary:  Python bindings for %{name}
 Group:    Development/Libraries
 Requires: PyQt4
+%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
 %description python
 The %{name}-python package contains python bindings for %{name}
 
 
 %package python-devel
-
 Summary:  Python bindings for %{name}
 Group:    Development/Libraries
-Requires: sip
+Requires: sip-devel
 Requires: PyQt4-devel
 Requires: %{name}-python = %{version}-%{release}
 
@@ -63,6 +64,7 @@ the python bindings for %{name}
 %prep
 %setup -q -n %{name}-mainline
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -108,9 +110,24 @@ rm -rf %{buildroot}
 %{_datadir}/sip/%{name}
 
 %changelog
-* Sat Jun 13 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-5
+- -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api
+
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.4.0-4
+- drop extraneous BR: sip-devel
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jul 16 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-2
+- Fix char* conversion (#511583)
+
+* Fri Mar 06 2009 John5342 <john5342 at, fedoraproject.org> 0.4.0-1
 - Updated to new upstream release (0.4.0)
 
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Dec 19 2008 John5342 <john5342 at, fedoraproject.org> 0.3.0-2
 - Implemented package review suggestions
 - Remove BR: eet-devel