rpms/qscintilla/devel .cvsignore, 1.2, 1.3 qscintilla.spec, 1.4, 1.5 sources, 1.2, 1.3

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Nov 9 16:57:22 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7688

Modified Files:
	.cvsignore qscintilla.spec sources 
Log Message:
* Thu Nov 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7-1
- QScintilla1-1.71-gpl-1.7.tar.gz



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
+++ .cvsignore	9 Nov 2006 16:56:51 -0000	1.3
@@ -1 +1,2 @@
 qscintilla-1.65-gpl-1.6.tar.gz
+QScintilla1-1.71-gpl-1.7.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qscintilla.spec	3 Sep 2006 19:10:45 -0000	1.4
+++ qscintilla.spec	9 Nov 2006 16:56:51 -0000	1.5
@@ -1,24 +1,28 @@
-%define         scintilla_ver   1.65
-%define         qtdir           %{_libdir}/qt-3.3
+
+%define         scintilla_ver   1.71
 
 Name:	        qscintilla 
-Version:        1.6
-Release:        3.3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A Scintilla port to Qt
 
 License:        GPL
 Group:          Development/Tools
 Url:            http://www.riverbankcomputing.co.uk/qscintilla/
-Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
-Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
+Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla1-%{scintilla_ver}-gpl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4
+Patch1: 	qscintilla-1.61-gpl-1.4-designer-incpath.patch
+
+BuildRequires:  qt-devel
+
+%global qtdir	%(qmake -query QT_INSTALL_PREFIX)
+%global qtdata	%(qmake -query QT_INSTALL_DATA)
+%global qtinc	%{qtdir}/include 
+%global qtlib	%{qtdir}/lib 
 
 %description
-QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
-and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
-MacOS/X).  Qt v3 or later is required.
+QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 This version of QScintilla is based on Scintilla v%{scintilla_ver}.
 
@@ -27,28 +31,27 @@
 Summary:        QScintilla designer plugin 
 Group:          Development/Tools
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4
-
+Requires:       qt-designer
 %description designer
-QScintillla designer plugin.
-
+%{summary}.
 
 %package devel
 Summary:        QScintilla Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4
-
+Requires:       qt-devel 
 %description devel
-These are the development files for QScintilla, needed to build against
-QScintilla.
+%{summary}.
 
 
 %prep
-%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
+%setup -q -n QScintilla1-%{scintilla_ver}-gpl-%{version}
+
 %patch1 -p1 -b .designer-incpath
+
 # 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 -type f -exec chmod 0644 {} ';'
 
@@ -84,29 +87,31 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE NEWS README
-%{qtdir}/lib/*.so.*
-%{qtdir}/translations/*
-
+%{qtlib}/lib*.so.*
+%{qtdata}/translations/*
 
 %files designer
 %defattr(-,root,root,-)
 %{qtdir}/plugins/designer/*
 
-
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html doc/Scintilla example
-%{qtdir}/lib/*.so
-%{qtdir}/include/*
+%{qtlib}/lib*.so
+%{qtinc}/*
 
 
 %changelog
+* Thu Nov 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.7-1
+- QScintilla1-1.71-gpl-1.7.tar.gz
+
 * Sun Sep 03 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6-3.3
 - FC6 rebuild.
 - Export flags.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 15:10:44 -0000	1.2
+++ sources	9 Nov 2006 16:56:51 -0000	1.3
@@ -1 +1 @@
-8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz
+145321e9e3ae7d4edc7f2bf6954b6763  QScintilla1-1.71-gpl-1.7.tar.gz




More information about the fedora-extras-commits mailing list