RPM Packaging: update tqscintilla

2 files changed, 128 insertions, 113 deletions

diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch
deleted file mode 100644
index 3922b6e27..000000000
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ftbfs	2013-07-21 10:56:22.714582322 +0200
-+++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro	2013-09-02 20:00:39.455251114 +0200
-@@ -27,7 +27,7 @@
- TARGET = qscintilla
- # DESTDIR = $(QTDIR)/lib
- CONFIG += qt warn_off release dll thread
--INCLUDEPATH = . ../include ../src /usr/include/tqt
-+INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3
- DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER
- 
- HEADERS = \
-@@ -211,10 +211,10 @@
- 	qscintilla_ru.ts
- 
- 
--header.path = $(QTDIR)/include
-+header.path = /usr/include/tqt3
- header.files = qextscintilla*.h
- 
--trans.path = $(QTDIR)/translations
-+trans.path = /usr/share/tqt3/translations
- trans.files = qscintilla_*.qm
- 
- INSTALLS += header trans
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index 134b4e99f..a9cb33827 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -1,51 +1,59 @@
-# Default version for this component
-%define tdecomp tqscintilla
+#
+# spec file for package tqscintilla (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
+%define tde_pkg tqscintilla
+%define tde_prefix /opt/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-
-%define tde_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqscintilla %{_lib}tqscintilla
+%else
+%define libtqscintilla libtqscintilla
+%endif
 
 
-Name:			trinity-%{tdecomp}
-Summary:		TQt source code editing component based on Scintilla
-Version:		1.7.1
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.7.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	TQt source code editing component based on Scintilla
+Group:		Development/Libraries/C and C++
+URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
 License:	GPLv2+
-Group:		Development/Tools
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-Url:		http://www.riverbankcomputing.co.uk/qscintilla/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# Fix FTBFS when using TQT3
-Patch0:		tqscintilla-14.0.0-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -56,36 +64,93 @@ when editing and debugging source code.
 
 TQScintilla is a port or Scintilla to the TQt GUI toolkit.
 
+##########
+
+%package -n %{libtqscintilla}7
+Summary:	TQt source code editing component based on Scintilla
+Group:		Development/Libraries/C and C++
+Provides:	libtqscintilla = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n %{libtqscintilla}7
+Scintilla is a free source code editing component. It has features found
+in standard editing components, as well as features especially useful
+when editing and debugging source code.
+
+TQScintilla is a port or Scintilla to the TQt GUI toolkit.
+
+%post -n %{libtqscintilla}7
+/sbin/ldconfig
+
+%postun -n %{libtqscintilla}7
+/sbin/ldconfig
+
+%files -n %{libtqscintilla}7
+%defattr(-,root,root,-)
+%doc ChangeLog LICENSE NEWS README
+%{_libdir}/libqscintilla.so.7
+%{_libdir}/libqscintilla.so.7.0
+%{_libdir}/libqscintilla.so.7.0.1
+%{_libdir}/tqt3/plugins/designer/*.so
+%{_datadir}/tqt3/translations/*.qm
+
+##########
+
+%package -n %{libtqscintilla}-devel
+Summary:	TQScintilla Development Files
+Group:		Development/Libraries/C and C++
+Provides:	libtqscintilla-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{libtqscintilla}7 = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	tqt3-devel >= 3.5.0
+
+%description -n %{libtqscintilla}-devel
+This package contains the development files for tqscintilla.
+
+%post -n %{libtqscintilla}-devel
+/sbin/ldconfig
+
+%postun -n %{libtqscintilla}-devel
+/sbin/ldconfig
+
+%files -n %{libtqscintilla}-devel
+%defattr(-,root,root,-)
+%doc doc/Scintilla example
+%{_includedir}/tqscintilla/
+%{_libdir}/libqscintilla.so
+
+##########
 
-%package designer
-Summary:        TQScintilla designer plugin 
-Group:          Development/Tools
-Requires:       %{name} = %{version}-%{release}
-Requires:       trinity-tqt3-designer
+%package -n %{libtqscintilla}-doc
+Summary:	TQScintilla Documentation
+Group:		Development/Libraries/C and C++
+Requires:	%{libtqscintilla}7 = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description designer
-%{summary}.
+%description -n %{libtqscintilla}-doc
+This package contains the documentation for tqscintilla.
 
-%package devel
-Summary:        TQScintilla Development Files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       trinity-tqt3-devel 
+%files -n %{libtqscintilla}-doc
+%defattr(-,root,root,-)
+%{tde_docdir}/HTML/en/%{name}/
 
-%description devel
-%{summary}.
+##########
 
-%package doc
-Summary:        TQScintilla Documentation
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
+%debug_package
+%endif
 
-%description doc
-%{summary}.
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
+
+# Fix perms
+chmod -x doc/Scintilla/*
+chmod -x example/*
+
+# Fix path in project files
+%__sed -i "qt/qscintilla.pro" \
+  -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \
+  -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \
+  -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|"
 
 %__sed -i "designer/designer.pro" \
   -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \
@@ -99,7 +164,6 @@ export QTDIR=%{_libdir}/tqt3
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %__make %{?_smp_mflags} -C qt
 %__make %{?_smp_mflags} -C designer
@@ -118,10 +182,12 @@ for i in include/*.h; do
 	%__install -D -m 644 $i %{buildroot}${QTINC}/private/${i##*/}
 done
 
-# Installs the HTML documentation
+# Installs the HTML documentation correctly
 for i in doc/html/*; do
 	%__install -D -m 644 $i %{buildroot}%{tde_docdir}/HTML/en/%{name}/${i##*/}
 done
+#__mkdir_p %{?buildroot}%{tde_docdir}/HTML/en/
+#__mv -f %{?buildroot}%{_docdir} %{?buildroot}%{tde_docdir}/HTML/en/%{name}
 
 # Installs the Designer plugin
 for i in designer/*.so; do
@@ -132,48 +198,21 @@ done
 %__mkdir_p %{buildroot}%{_libdir}
 %__mv -f tmplib/* %{buildroot}%{_libdir}
 
+
 # Fix private headers location
 %__mv -f %{buildroot}/private %{buildroot}%{_includedir}/tqt3
 %__mv -f %{buildroot}%{_includedir}/tqt3 %{buildroot}%{_includedir}/tqscintilla
 
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+# Fix permissions
+chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
+chmod a-x %{buildroot}%{_includedir}/tqscintilla/*.h
 
-%post devel
-/sbin/ldconfig
 
-%postun devel
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog LICENSE NEWS README
-%{_libdir}/libqscintilla.so.*
-%{_datadir}/tqt3/translations/*.qm
-
-%files designer
-%defattr(-,root,root,-)
-%{_libdir}/tqt3/plugins/designer/*.so
-
-%files devel
-%defattr(-,root,root,-)
-%doc doc/html doc/Scintilla example
-%{_includedir}/tqscintilla/*.h
-%{_includedir}/tqscintilla/private/*.h
-%{_libdir}/libqscintilla.so
+%clean
+%__rm -rf $RPM_BUILD_ROOT
 
-%files doc
-%defattr(-,root,root,-)
-%{tde_docdir}/HTML/en/%{name}
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.7.1-1
 - Initial release for TDE 14.0.0