rpms/qscintilla/F-10 .cvsignore, 1.7, 1.8 qscintilla.spec, 1.20, 1.21 sources, 1.7, 1.8

[Rex Dieter]

Author: rdieter

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

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-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	22 Sep 2008 14:51:20 -0000	1.7
+++ .cvsignore	8 Aug 2009 21:00:13 -0000	1.8
@@ -1 +1 @@
-QScintilla-gpl-2.3.tar.gz
+QScintilla-gpl-2.4.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- qscintilla.spec	22 Sep 2008 14:51:20 -0000	1.20
+++ qscintilla.spec	8 Aug 2009 21:00:13 -0000	1.21
@@ -1,8 +1,11 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} 
-%define scintilla_ver 1.76
+
+%define scintilla_ver 1.78
+
+# bootstrapping -python
+%define python 1
 
 Name:    qscintilla
-Version: 2.3
+Version: 2.4
 Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
@@ -16,9 +19,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
+
 # for -python
-BuildRequires:  PyQt4-devel
+%if 0%{?python}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global pyqt4_version 4.5
+BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
+%endif
 
 
 %description
@@ -47,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}.
 
@@ -65,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 {} ';'
@@ -78,18 +83,16 @@ 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
 
+%if 0%{?python}
 pushd Python
 %{__python} configure.py \
             -c -j 3 \
@@ -97,6 +100,7 @@ pushd Python
             -o ../Qt4
 make %{?_smp_mflags}
 popd
+%endif
 
 
 %install
@@ -104,10 +108,12 @@ rm -rf %{buildroot}
 
 make -C Qt4 install INSTALL_ROOT=%{buildroot} 
 make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
+%if 0%{?python}
 make -C Python install DESTDIR=%{buildroot}
 
 chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
 chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
+%endif
 
 
 %clean
@@ -124,7 +130,7 @@ rm -rf %{buildroot}
 %doc ChangeLog NEWS README
 %doc LICENSE.GPL3
 %doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/libqscintilla2.so.4*
+%{_qt4_libdir}/libqscintilla2.so.5*
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
@@ -138,6 +144,7 @@ rm -rf %{buildroot}
 %{_qt4_headerdir}/Qsci/
 %{_qt4_libdir}/libqscintilla2.so
 
+%if 0%{?python}
 %files python
 %defattr(-,root,root,-)
 %{python_sitearch}/PyQt4/Qsci.so
@@ -145,9 +152,26 @@ rm -rf %{buildroot}
 %files python-devel
 %defattr(-,root,root,-)
 %{_datadir}/sip/PyQt4/Qsci/
+%endif
 
 
 %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
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.3.2-2
+- Rebuild for Python 2.6
+
+* Mon Nov 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.2-1
+- Qscintilla-gpl-2.3.2
+- soname bump 4->5
+
+* Mon Nov 10 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3.1-1
+- Qscintilla-gpl-2.3.1
+
 * Mon Sep 22 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.3-1
 - Qscintilla-gpl-2.3
 - scintilla_ver is missing (#461777)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	22 Sep 2008 14:51:20 -0000	1.7
+++ sources	8 Aug 2009 21:00:13 -0000	1.8
@@ -1 +1 @@
-473d7793592fe96406310a2ab34e9e9b  QScintilla-gpl-2.3.tar.gz
+dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz