rpms/qscintilla/F-11 .cvsignore, 1.8, 1.9 qscintilla.spec, 1.26, 1.27 sources, 1.8, 1.9

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20995

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
- QScintilla-gpl-2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2008 17:38:53 -0000	1.8
+++ .cvsignore	8 Aug 2009 20:59:28 -0000	1.9
@@ -1 +1 @@
-QScintilla-gpl-2.3.2.tar.gz
+QScintilla-gpl-2.4.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/qscintilla.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- qscintilla.spec	17 Jul 2009 12:39:17 -0000	1.26
+++ qscintilla.spec	8 Aug 2009 20:59:28 -0000	1.27
@@ -1,12 +1,12 @@
 
-%define scintilla_ver 1.76
+%define scintilla_ver 1.78
 
 # bootstrapping -python
-#define python 1
+%define python 1
 
 Name:    qscintilla
-Version: 2.3.2
-Release: 3%{?dist}.1
+Version: 2.4
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -19,9 +19,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
+
+# for -python
 %if 0%{?python}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-BuildRequires:  PyQt4-devel
+%global pyqt4_version 4.5
+BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
 %endif
 
@@ -52,7 +55,7 @@ Requires: qt4-devel 
 Summary:  QScintilla PyQt4 bindings
 Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: PyQt4
+Requires: PyQt4 >= %{pyqt4_version}
 %description python
 %{summary}.
 
@@ -70,9 +73,6 @@ Requires: PyQt4-devel
 
 %patch1 -p1 -b .designer-incpath-qt4
 
-# fixups to support RPM_BUILD_ROOT/DESTDIR
-sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
-
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
 find src include -type f -exec chmod 0644 {} ';'
@@ -83,15 +83,12 @@ sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTI
 
 %build
 pushd Qt4
-#sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro
 %{_qt4_qmake} qscintilla.pro
-#echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
 pushd designer-Qt4
 %{_qt4_qmake} designer.pro
-#echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
 make %{?_smp_mflags}
 popd
 
@@ -159,6 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
+- QScintilla-gpl-2.4
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-11/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Nov 2008 17:38:54 -0000	1.8
+++ sources	8 Aug 2009 20:59:28 -0000	1.9
@@ -1 +1 @@
-2e112d01988f2e044c43a1e7f5e1dd87  QScintilla-gpl-2.3.2.tar.gz
+dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz