rpms/qscintilla/F-9 .cvsignore, 1.5, 1.6 QScintilla-2-gpl-Qt4-incpath.patch, 1.1, 1.2 qscintilla.spec, 1.17, 1.18 sources, 1.5, 1.6 qscintilla-1.73-gpl-2.1-paths.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sat Jul 19 06:21:52 UTC 2008 

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22532

Modified Files:
	.cvsignore QScintilla-2-gpl-Qt4-incpath.patch qscintilla.spec 
	sources 
Removed Files:
	qscintilla-1.73-gpl-2.1-paths.patch 
Log Message:
sync w/devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Jan 2008 21:33:44 -0000	1.5
+++ .cvsignore	19 Jul 2008 06:20:21 -0000	1.6
@@ -1 +1 @@
-QScintilla-1.73-gpl-2.1.tar.gz
+QScintilla-gpl-2.2.tar.gz

QScintilla-2-gpl-Qt4-incpath.patch:

Index: QScintilla-2-gpl-Qt4-incpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-9/QScintilla-2-gpl-Qt4-incpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QScintilla-2-gpl-Qt4-incpath.patch	28 Jan 2008 21:33:44 -0000	1.1
+++ QScintilla-2-gpl-Qt4-incpath.patch	19 Jul 2008 06:20:22 -0000	1.2
@@ -1,8 +1,8 @@
---- qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro.designer-incpath	2004-09-16 15:09:24.000000000 -0500
-+++ qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro	2004-09-16 15:08:31.000000000 -0500
-@@ -9,4 +9,6 @@
- 
- SOURCES += qscintillaplugin.cpp
+--- QScintilla-gpl-2.2/designer-Qt4/designer.pro.BAD	2008-07-18 13:22:40.000000000 -0500
++++ QScintilla-gpl-2.2/designer-Qt4/designer.pro	2008-07-18 13:23:02.000000000 -0500
+@@ -12,4 +12,6 @@
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
  
 -LIBS += -lqscintilla2
 +LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-9/qscintilla.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qscintilla.spec	1 Jun 2008 22:12:23 -0000	1.17
+++ qscintilla.spec	19 Jul 2008 06:20:22 -0000	1.18
@@ -1,20 +1,19 @@
-
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define         scintilla_ver   1.73
 
-Name:	        qscintilla
-Version:        2.1
-Release:        4%{?dist}.1
+Name:           qscintilla
+Version:        2.2
+Release:        3%{?dist}
 Summary:        A Scintilla port to Qt
 
-License:        GPLv2+
+# matches up (pretty much) with qt4
+License:        GPLv3 or GPLv2 with exceptions
 Group:          Development/Tools
-Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla2/QScintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
+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)
 
-Patch1: 	QScintilla-2-gpl-Qt4-incpath.patch
-Patch2:         qscintilla-1.73-gpl-2.1-paths.patch
+#why is this not upstream?
+Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRequires:  qt4-devel
 # for -python
@@ -64,10 +63,9 @@
 
 
 %prep
-%setup -q -n QScintilla-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla-gpl-%{version}
 
 %patch1 -p1 -b .designer-incpath-qt4
-%patch2 -p1 -b .target.path
 
 # fixups to support RPM_BUILD_ROOT/DESTDIR
 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
@@ -76,8 +74,8 @@
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
 find src include -type f -exec chmod 0644 {} ';'
 
-# fix line endings in license file
-sed -i 's/\r//' LICENSE
+# fix line endings in license file(s)
+sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT
 
 
 %build
@@ -104,19 +102,18 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4 install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4 install
-make DESTDIR=$RPM_BUILD_ROOT -C Python install
-chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/PyQt4/Qsci.so
-
-# HACK ALERT (FIXME), ensure these dirs exist 
-mkdir -p $RPM_BUILD_ROOT%{_qt4_datadir}/qsci/
-mkdir -p $RPM_BUILD_ROOT%{_qt4_prefix}/qsci/
+rm -rf %{buildroot}
+
+make -C Qt4 install INSTALL_ROOT=%{buildroot} 
+make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
+make -C Python install DESTDIR=%{buildroot}
+
+chrpath --list   %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
+chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
@@ -126,10 +123,11 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE NEWS README
+%doc ChangeLog NEWS README
+%doc LICENSE.GPL3
+%doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
 %{_qt4_libdir}/lib*.so.*
 %{_qt4_translationdir}/*
-%{_qt4_datadir}/qsci/
 %{_qt4_prefix}/qsci/
 
 %files designer
@@ -141,11 +139,9 @@
 %doc doc/html-Qt4 doc/Scintilla example-Qt4
 %{_qt4_headerdir}/Qsci/
 %{_qt4_libdir}/lib*.so
-%{_qt4_prefix}/qsci
 
 %files python
 %defattr(-,root,root,-)
-%doc LICENSE
 %{python_sitearch}/PyQt4/Qsci.so
 
 %files python-devel
@@ -154,8 +150,16 @@
 
 
 %changelog
-* Sun Jun 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1-4.1
-- fix %files
+* Fri Jul 18 2008 Dennis Gilmore <dennis at ausil.us> - 2.2-3
+- rebuild for newer PyQT4
+- fix #449423 properly
+
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.2-2
+- fix build (#449423)
+
+* Mon May 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.2-1
+- Qscintilla-gpl-2.2
+- License: GPLv3 or GPLv2 with exceptions
 
 * Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.1-4
 - use %%_qt4_* macros (preparing for qt4 possibly moving %%_qt4_datadir)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Jan 2008 21:33:44 -0000	1.5
+++ sources	19 Jul 2008 06:20:22 -0000	1.6
@@ -1 +1 @@
-13049717628391ca4db43f7ede0eeeb4  QScintilla-1.73-gpl-2.1.tar.gz
+a6056c444494f3f849020d241f86c286  QScintilla-gpl-2.2.tar.gz


--- qscintilla-1.73-gpl-2.1-paths.patch DELETED ---

More information about the fedora-extras-commits mailing list