From 234bbcce5a6f2a57c8e8b1007293667f4d2764e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 22 Mar 2015 14:17:12 +0100 Subject: RPM packaging: update gtk-qt-engine --- .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 94 +++++++++---- .../gtk-qt-engine-3.5.13-fix_glib_include.patch | 11 -- .../gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec | 149 --------------------- .../gtk-qt-engine/gtk-qt-engine-3.5.13.spec | 145 -------------------- 4 files changed, 69 insertions(+), 330 deletions(-) delete mode 100644 redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch delete mode 100644 redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec delete mode 100644 redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec (limited to 'redhat') diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index efe337232..c4c97901f 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -1,41 +1,55 @@ -# Default version for this component -%define tde_pkg gtk-qt-engine +# +# spec file for package gtk-qt-engine (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_pkg gtk-qt-engine +%define tde_prefix /opt/trinity +%define tde_appdir %{tde_datadir}/applications %define tde_bindir %{tde_prefix}/bin %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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%define _docdir %{tde_docdir} - Name: trinity-%{tde_pkg} -Summary: theme engine using Qt for GTK+ 2.x and Trinity +Epoch: %{tde_epoch} Version: 0.8 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Theme engine using Qt for GTK+ 2.x and Trinity Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,13 +58,32 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 + BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 +BuildRequires: gtk2-devel +%else +BuildRequires: gtk+2.0-devel +%endif + +# SUSE desktop files utility +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%if 0%{?opensuse_bs} && 0%{?suse_version} +# for xdg-menu script +BuildRequires: brp-check-trinity +%endif %description @@ -63,10 +96,14 @@ Please note that this package is targeted at Trinity users and therefore provide a way to configure it from within KControl. -%if 0%{?suse_version} || 0%{?pclinuxos} +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -124,17 +161,24 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so %{tde_appdir}/kcmgtk.desktop +%dir %{tde_datadir}/kgtk %{tde_datadir}/kgtk/gtk-qt-engine.rc.sh %{tde_datadir}/kgtk/.gtkrc-2.0-kde4 %{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory +%dir %{_libdir}/gtk-2.0 +%dir %{_libdir}/gtk-2.0/2.10.0 +%dir %{_libdir}/gtk-2.0/2.10.0/engines %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.la %{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so +%dir %{_datadir}/themes +%dir %{_datadir}/themes/Qt +%dir %{_datadir}/themes/Qt/gtk-2.0 %{_datadir}/themes/Qt/gtk-2.0/gtkrc %changelog -* Fri Jul 05 2013 Francois Andriot - 0.8-7 +* Fri Jul 05 2013 Francois Andriot - 2:0.8-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch deleted file mode 100644 index caf67e13b..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13-fix_glib_include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk-qt-engine/src/qt_theme_draw.c.ORI 2012-05-01 19:52:05.317334548 +0200 -+++ gtk-qt-engine/src/qt_theme_draw.c 2012-05-01 19:54:50.474099070 +0200 -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - - #ifdef HAVE_BONOBO - #include diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec deleted file mode 100644 index c17e4ce0b..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.1.spec +++ /dev/null @@ -1,149 +0,0 @@ -# Default version for this component -%define kdecomp gtk-qt-engine - -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: 0.8 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine -that calls Qt to do the actual drawing. This makes your GTK 2 applications -look almost like real Qt applications and gives you a more unified desktop -experience. - -Please note that this package is targeted at Trinity users and therefore provides -a way to configure it from within KControl. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Renames the '.po' files -for f in po/*/*.po; do - pushd ${f%/*} - mv -f *.po gtk-qt-engine.po - popd -done - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang %{kdecomp} - -# Adds TDE's specific GTKRC -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -%clean -%__rm -rf %{buildroot} - - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/kcm_kcmgtk.la -%{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -# The following files are outside TDE's directory -%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so -%{_datadir}/themes/Qt/gtk-2.0/gtkrc - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.8-4 -- Initial release for TDE 3.5.13.1 - -* Mon Aug 27 2012 Francois Andriot - 0.8-3 -- Add missing gtkrc files - -* Tue May 01 2012 Francois Andriot - 0.8-2 -- Rebuilt for Fedora 17 -- Fix FTBFS with newer glib -- Removes useless post and postun - -* Sun Nov 20 2011 Francois Andriot - 0.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec deleted file mode 100644 index 88dcb55ab..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define kdecomp gtk-qt-engine - -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: 0.8 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 - -# [gtk-qt-engine] Fix inclusion of 'glib.h' -Patch1: gtk-qt-engine-3.5.13-fix_glib_include.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine -that calls Qt to do the actual drawing. This makes your GTK 2 applications -look almost like real Qt applications and gives you a more unified desktop -experience. - -Please note that this package is targeted at Trinity users and therefore provides -a way to configure it from within KControl. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 - -# Renames the '.po' files -for f in po/*/*.po; do - pushd ${f%/*} - mv -f *.po gtk-qt-engine.po - popd -done - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%if 0%{?rhel} || 0%{?fedora} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang %{kdecomp} - -# Adds TDE's specific GTKRC -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -%clean -%__rm -rf %{buildroot} - - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/kcm_kcmgtk.la -%{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -# The following files are outside TDE's directory -%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so -%{_datadir}/themes/Qt/gtk-2.0/gtkrc - - -%Changelog -* Mon Aug 27 2012 Francois Andriot - 0.8-3 -- Add missing gtkrc files - -* Tue May 01 2012 Francois Andriot - 0.8-2 -- Rebuilt for Fedora 17 -- Fix FTBFS with newer glib -- Removes useless post and postun - -* Sun Nov 20 2011 Francois Andriot - 0.8-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.3