rpms/qscintilla/devel .cvsignore, 1.9, 1.10 qscintilla.spec, 1.35, 1.36 sources, 1.9, 1.10 QScintilla-gpl-2.4-autocomplete_popup.patch, 1.2, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Jan 15 17:09:28 UTC 2010
- Previous message: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.60, 1.61 policy-20100106.patch, 1.6, 1.7 selinux-policy.spec, 1.995, 1.996
- Next message: rpms/ca-certificates/devel blacklist.txt, NONE, 1.1 certdata.txt, NONE, 1.1 certdata2pem.py, NONE, 1.1 ca-certificates.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3819
Modified Files:
.cvsignore qscintilla.spec sources
Removed Files:
QScintilla-gpl-2.4-autocomplete_popup.patch
Log Message:
* Fri Jan 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.1-1
- 2.4.1
- pyqt4_version 4.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 17 Jun 2009 14:14:34 -0000 1.9
+++ .cvsignore 15 Jan 2010 17:09:28 -0000 1.10
@@ -1 +1 @@
-QScintilla-gpl-2.4.tar.gz
+QScintilla-gpl-2.4.1.tar.gz
Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- qscintilla.spec 7 Jan 2010 22:28:02 -0000 1.35
+++ qscintilla.spec 15 Jan 2010 17:09:28 -0000 1.36
@@ -5,8 +5,8 @@
%define python 1
Name: qscintilla
-Version: 2.4
-Release: 10%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: A Scintilla port to Qt
# matches up (pretty much) with qt4
License: GPLv3 or GPLv2 with exceptions
@@ -18,8 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
## Upstreamable patches
# posted to upstream ml, not in archive yet
Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch
-# http://www.riverbankcomputing.com/pipermail/qscintilla/2009-October/000496.html
-Patch51: QScintilla-gpl-2.4-autocomplete_popup.patch
Obsoletes: qscintilla-designer < 2.4-3
Provides: qscintilla-designer = %{version}-%{release}
@@ -29,7 +27,7 @@ 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)")}
-%global pyqt4_version 4.6.1
+%global pyqt4_version 4.7
BuildRequires: PyQt4-devel >= %{pyqt4_version}
BuildRequires: sip-devel
BuildRequires: chrpath
@@ -77,7 +75,6 @@ Obsoletes: qscintilla-python-devel < 2.4
%setup -q -n QScintilla-gpl-%{version}
%patch50 -p1 -b .qt4_designer_incpath
-%patch51 -p1 -b .autocomplete_popup
# fix permissions on doc files
find doc example-Qt4 -type f -exec chmod 0644 {} ';'
@@ -160,6 +157,10 @@ rm -rf %{buildroot}
%changelog
+* Fri Jan 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.1-1
+- 2.4.1
+- pyqt4_version 4.7
+
* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4-10
- rebuild (sip)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 17 Jun 2009 14:14:34 -0000 1.9
+++ sources 15 Jan 2010 17:09:28 -0000 1.10
@@ -1 +1 @@
-dd69520ec91f1acb97a4eb74ddde37c9 QScintilla-gpl-2.4.tar.gz
+2815ea8b7f15d857d657743d023dcbc3 QScintilla-gpl-2.4.1.tar.gz
--- QScintilla-gpl-2.4-autocomplete_popup.patch DELETED ---
- Previous message: rpms/selinux-policy/F-12 booleans-targeted.conf, 1.60, 1.61 policy-20100106.patch, 1.6, 1.7 selinux-policy.spec, 1.995, 1.996
- Next message: rpms/ca-certificates/devel blacklist.txt, NONE, 1.1 certdata.txt, NONE, 1.1 certdata2pem.py, NONE, 1.1 ca-certificates.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list