[qscintilla] 2.6

Rex Dieter rdieter at fedoraproject.org
Sun Dec 4 01:37:00 UTC 2011


commit 3536486208461222bd8f09e3c8096cf10521d260
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Dec 3 19:37:46 2011 -0600

    2.6

 .gitignore      |    1 +
 qscintilla.spec |   13 ++++++-------
 sources         |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec5c9f8..daf9409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /QScintilla-gpl-2.4.6.tar.gz
 /QScintilla-gpl-2.5.1.tar.gz
+/QScintilla-gpl-2.6.tar.gz
diff --git a/qscintilla.spec b/qscintilla.spec
index c86ebe5..2c4961c 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -5,8 +5,8 @@
 %global python 1
 
 Name:    qscintilla
-Version: 2.5.1
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -31,7 +31,6 @@ BuildRequires:  qt4-devel
 %global pyqt4_version 4.7 
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  sip-devel 
-BuildRequires:  chrpath
 %endif
 
 
@@ -115,9 +114,6 @@ 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
 
 
@@ -133,7 +129,7 @@ rm -rf %{buildroot}
 %doc NEWS README
 %doc LICENSE.GPL3 LICENSE.GPL2
 %doc GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/libqscintilla2.so.6*
+%{_qt4_libdir}/libqscintilla2.so.8*
 %{_qt4_plugindir}/designer/libqscintillaplugin.so
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
@@ -156,6 +152,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 03 2011 Rex Dieter <rdieter at fedoraproject.org> 2.6-1
+- 2.6
+
 * Fri Nov 11 2011 Rex Dieter <rdieter at fedoraproject.org> 2.5.1-2
 - rebuild (sip)
 
diff --git a/sources b/sources
index 95e6670..8e9b828 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd7edef5ff674d307057a3c12dbd8fce  QScintilla-gpl-2.5.1.tar.gz
+0605a8006ea752ec2d1d7fc4791d1c75  QScintilla-gpl-2.6.tar.gz


More information about the scm-commits mailing list