rpms/qscintilla/devel .cvsignore, 1.5, 1.6 qscintilla.spec, 1.15, 1.16 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
Mon May 5 12:59:50 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10137
Modified Files:
.cvsignore qscintilla.spec sources
Removed Files:
qscintilla-1.73-gpl-2.1-paths.patch
Log Message:
* Mon May 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.2-1
- Qscintilla-gpl-2.2
- License: GPLv3 or GPLv2 with exceptions
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/.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 5 May 2008 12:59:14 -0000 1.6
@@ -1 +1 @@
-QScintilla-1.73-gpl-2.1.tar.gz
+QScintilla-gpl-2.2.tar.gz
Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qscintilla.spec 14 Mar 2008 13:33:26 -0000 1.15
+++ qscintilla.spec 5 May 2008 12:59:14 -0000 1.16
@@ -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}
+Name: qscintilla
+Version: 2.2
+Release: 1%{?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
+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,15 +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
+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
@@ -122,10 +123,13 @@
%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
%defattr(-,root,root,-)
@@ -139,7 +143,6 @@
%files python
%defattr(-,root,root,-)
-%doc LICENSE
%{python_sitearch}/PyQt4/Qsci.so
%files python-devel
@@ -148,6 +151,10 @@
%changelog
+* 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)
- -python: fix Requires
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/devel/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 5 May 2008 12:59:14 -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