rpms/qscintilla/devel .cvsignore, 1.6, 1.7 qscintilla.spec, 1.19, 1.20 sources, 1.6, 1.7

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7253

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
- Qscintilla-gpl-2.3
- scintilla_ver is missing (#461777)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 May 2008 12:59:14 -0000	1.6
+++ .cvsignore	22 Sep 2008 14:51:20 -0000	1.7
@@ -1 +1 @@
-QScintilla-gpl-2.2.tar.gz
+QScintilla-gpl-2.3.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qscintilla.spec	18 Jul 2008 18:40:48 -0000	1.19
+++ qscintilla.spec	22 Sep 2008 14:51:20 -0000	1.20
@@ -1,18 +1,18 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Name:           qscintilla
-Version:        2.2
-Release:        3%{?dist}
-Summary:        A Scintilla port to Qt
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} 
+%define scintilla_ver 1.76
 
+Name:    qscintilla
+Version: 2.3
+Release: 1%{?dist}
+Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
-License:        GPLv3 or GPLv2 with exceptions
-Group:          Development/Tools
-Url:            http://www.riverbankcomputing.com/software/qscintilla/
-Source0:        http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License: GPLv3 or GPLv2 with exceptions
+Group:   Development/Tools
+Url:     http://www.riverbankcomputing.com/software/qscintilla/
+Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#why is this not upstream?
+# TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
@@ -24,40 +24,38 @@
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
-This version of QScintilla is based on Scintilla v%{scintilla_ver}.
+%{?scintilla_ver:This version of QScintilla is based on Scintilla v%{scintilla_ver}.}
 
 
 %package designer
-Summary:        QScintilla designer plugin 
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-Requires:       qt4-designer
+Summary:  QScintilla designer plugin 
+Group:    Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-designer
 %description designer
 %{summary}.
 
 %package devel
-Summary:        QScintilla Development Files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       qt4-devel 
+Summary:  QScintilla Development Files
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel 
 %description devel
 %{summary}.
 
 %package python
-Summary:        QScintilla PyQt4 bindings
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       PyQt4
-#Obsoletes:      PyQt-qscintilla
+Summary:  QScintilla PyQt4 bindings
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: PyQt4
 %description python
 %{summary}.
 
 %package python-devel
-Summary:        Development files for QScintilla PyQt4 bindings 
-Group:          Development/Libraries
-Requires:       %{name}-python = %{version}-%{release}
-Requires:       PyQt4-devel
-#Obsoletes:      PyQt-qscintilla-devel 
+Summary:  Development files for QScintilla PyQt4 bindings 
+Group:    Development/Libraries
+Requires: %{name}-python = %{version}-%{release}
+Requires: PyQt4-devel
 %description python-devel
 %{summary}.
 
@@ -126,7 +124,7 @@
 %doc ChangeLog NEWS README
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/lib*.so.*
+%{_qt4_libdir}/libqscintilla2.so.4*
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
@@ -138,7 +136,7 @@
 %defattr(-,root,root,-)
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
 %{_qt4_headerdir}/Qsci/
-%{_qt4_libdir}/lib*.so
+%{_qt4_libdir}/libqscintilla2.so
 
 %files python
 %defattr(-,root,root,-)
@@ -150,6 +148,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
+- Qscintilla-gpl-2.3
+- scintilla_ver is missing (#461777)
+
 * Fri Jul 18 2008 Dennis Gilmore <dennis at ausil.us> - 2.2-3
 - rebuild for newer PyQT4
 - fix #449423 properly


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 May 2008 12:59:14 -0000	1.6
+++ sources	22 Sep 2008 14:51:20 -0000	1.7
@@ -1 +1 @@
-a6056c444494f3f849020d241f86c286  QScintilla-gpl-2.2.tar.gz
+473d7793592fe96406310a2ab34e9e9b  QScintilla-gpl-2.3.tar.gz