From 42ab93c0380ce831af490687f4c746714dadb677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 31 Mar 2015 20:14:36 +0200 Subject: [PATCH] RPM Packaging: update kbookreader, kchmviewer, kcmautostart, kcmldap --- redhat/applications/kbiff/kbiff-14.0.0.spec | 2 +- .../kbookreader/kbookreader-14.0.0.spec | 91 +++++++--- .../kbookreader/kbookreader-3.5.13.1.spec | 156 ----------------- .../kbookreader/kbookreader-3.5.13.spec | 147 ---------------- .../kchmviewer/kchmviewer-14.0.0.spec | 93 ++++++++--- .../kchmviewer-3.5.13-missing_ldflags.patch | 11 -- .../kchmviewer/kchmviewer-3.5.13.1.spec | 158 ------------------ .../kchmviewer/kchmviewer-3.5.13.spec | 149 ----------------- .../kcmautostart/kcmautostart-14.0.0.spec | 82 ++++++--- .../kcmautostart/kcmautostart-3.5.13.1.spec | 125 -------------- .../kcmautostart/kcmautostart-3.5.13.spec | 116 ------------- .../applications/kcmldap/kcmldap-14.0.0.spec | 84 +++++++--- 12 files changed, 250 insertions(+), 964 deletions(-) delete mode 100644 redhat/applications/kbookreader/kbookreader-3.5.13.1.spec delete mode 100644 redhat/applications/kbookreader/kbookreader-3.5.13.spec delete mode 100644 redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch delete mode 100644 redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec delete mode 100644 redhat/applications/kchmviewer/kchmviewer-3.5.13.spec delete mode 100644 redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec delete mode 100644 redhat/applications/kcmautostart/kcmautostart-3.5.13.spec diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index 11d058e37..a3beb5d92 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -37,7 +37,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 3.9 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: TDE mail notification utility +Summary: TDE mail notification utility Group: Applications/Internet URL: http://www.trinitydesktop.org/ diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec index 1ed0a672d..7f1eec178 100644 --- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec +++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec @@ -1,63 +1,93 @@ -# Default version for this component -%define tde_pkg kbookreader +# +# spec file for package kbookreader (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 kbookreader +%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: eBook reader for Trinity. +Epoch: %{tde_epoch} Version: 0.2.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: eBook reader for 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) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 kbookreader is an application which allows you to view eBooks within the Trinity Desktop Environment. -%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}} @@ -95,6 +125,15 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Fix desktop icon location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer +%endif + %clean %__rm -rf %{buildroot} @@ -114,7 +153,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %doc AUTHORS COPYING %{tde_bindir}/bookreader %{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Office/bookreader.desktop +%{tde_tdeappdir}/bookreader.desktop %{tde_datadir}/apps/bookreader/ %{tde_datadir}/config.kcfg/bookreader.kcfg %{tde_tdedocdir}/HTML/en/bookreader/ @@ -122,5 +161,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot - 0.2.0-6 +* Fri Jul 05 2013 Francois Andriot - 2:0.2.0-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec deleted file mode 100644 index 825244f38..000000000 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.1.spec +++ /dev/null @@ -1,156 +0,0 @@ -# Default version for this component -%define kdecomp kbookreader - -# 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: eBook reader for Trinity. -Version: 0.2.0 -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.1.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-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 - - -%description -kbookreader is an application which allows you to view eBooks -within the Trinity Desktop Environment. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/bookreader -%{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Utilities/bookreader.desktop -%{tde_datadir}/apps/bookreader/ -%{tde_datadir}/config.kcfg/bookreader.kcfg -%{tde_tdedocdir}/HTML/en/bookreader/ -%{tde_datadir}/icons/hicolor/*/apps/bookreader.png - - - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.2.0-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 0.2.0-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot - 0.2.0-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.spec deleted file mode 100644 index 5f4263f6f..000000000 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.spec +++ /dev/null @@ -1,147 +0,0 @@ -# Default version for this component -%define kdecomp kbookreader - -# 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: eBook reader for Trinity. -Version: 0.2.0 -Release: 2%{?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 - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -kbookreader is an application which allows you to view eBooks -within the Trinity Desktop Environment. - - -%prep -%setup -q -n applications/%{kdecomp} - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/bookreader -%{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Utilities/bookreader.desktop -%{tde_datadir}/apps/bookreader/ -%{tde_datadir}/config.kcfg/bookreader.kcfg -%{tde_tdedocdir}/HTML/en/bookreader/ -%{tde_datadir}/icons/hicolor/*/apps/bookreader.png - - - - -%Changelog -* Tue May 01 2012 Francois Andriot - 0.2.0-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sun Oct 30 2011 Francois Andriot - 0.2.0-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec index aa7094eee..0dadf8490 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec @@ -1,52 +1,78 @@ -# Default version for this component -%define tde_pkg kchmviewer +# +# spec file for package kchmviewer (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 kchmviewer +%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: CHM viewer for Trinity +Epoch: %{tde_epoch} Version: 3.1.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: CHM viewer for 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) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -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: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 KchmViewer is a chm (MS HTML help file format) viewer, written in C++. @@ -69,10 +95,14 @@ cross-links and parent/child entries in index as well as Persistent bookmarks support. Correctly detects and shows encoding of any valid chm file. -%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,6 +154,17 @@ export PATH="%{tde_bindir}:${PATH}" # Removes useless files %__rm -f %{?buildroot}%{tde_libdir}/*.a +# Fix desktop icon location +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" + +# Updates applications categories for openSUSE +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" +%if 0%{?suse_version} +%suse_update_desktop_file -G "Compressed HTML Viewer" kchmviewer Office Viewer +%endif + + %clean %__rm -rf %{buildroot} @@ -144,7 +185,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %{tde_bindir}/kchmviewer %{tde_tdelibdir}/tdeio_msits.la %{tde_tdelibdir}/tdeio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop +%{tde_tdeappdir}/kchmviewer.desktop %{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %{tde_datadir}/services/msits.protocol %{tde_tdedocdir}/HTML/en/kchmviewer/ @@ -152,5 +193,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot - 3.1.2-6 +* Fri Jul 05 2013 Francois Andriot - 2:3.1.2-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch b/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch deleted file mode 100644 index 05012b5ba..000000000 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kchmviewer/lib/kio-msits/Makefile.am.ORI 2011-11-21 00:43:10.415241950 +0100 -+++ kchmviewer/lib/kio-msits/Makefile.am 2011-11-21 00:43:22.929241583 +0100 -@@ -5,7 +5,7 @@ - - kio_msits_la_SOURCES = msits.cpp - kio_msits_la_LIBADD = -lkio $(CHM_LIBS) --kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN) -+kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS) - - protocol_DATA = msits.protocol - protocoldir = $(kde_servicesdir) diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec deleted file mode 100644 index 774a8ff7a..000000000 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.1.spec +++ /dev/null @@ -1,158 +0,0 @@ -# Default version for this component -%define kdecomp kchmviewer - -# 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: CHM viewer for Trinity -Version: 3.1.2 -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.1.tar.gz - -# [kchmviewer] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 -Patch0: kchmviewer-3.5.13-missing_ldflags.patch - -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 - -%description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. -Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or GNOME. However, it may be compiled -with full Trinity support, including Trinity widgets and KIO/KHTML. - -The main advantage of KchmViewer is non-English language support. Unlike -others, KchmViewer in most cases correctly detects help file encoding, -correctly shows tables of context of Russian, Korean, Chinese and Japanese -help files, and correctly searches in non-English help files (search for -MBCS languages - ja/ko/ch is still in progress). - -Completely safe and harmless. Does not support JavaScript in any way, -optionally warns you before opening an external web page, or switching to -another help file. Shows an appropriate image for every TOC entry. - -KchmViewer Has complete chm index support, including multiple index entries, -cross-links and parent/child entries in index as well as Persistent bookmarks -support. Correctly detects and shows encoding of any valid chm file. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch0 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-x \ - --with-kde \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -# Removes useless files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING FAQ README -%{tde_bindir}/kchmviewer -%{tde_tdelibdir}/kio_msits.la -%{tde_tdelibdir}/kio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png -%{tde_datadir}/services/msits.protocol - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 3.1.2-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 3.1.2-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot - 3.1.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec deleted file mode 100644 index e2dba2a34..000000000 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.spec +++ /dev/null @@ -1,149 +0,0 @@ -# Default version for this component -%define kdecomp kchmviewer - -# 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: CHM viewer for Trinity -Version: 3.1.2 -Release: 2%{?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 - -# [kchmviewer] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 -Patch0: kchmviewer-3.5.13-missing_ldflags.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel -BuildRequires: desktop-file-utils - -%description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. -Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on KDE or GNOME. However, it may be compiled -with full Trinity support, including Trinity widgets and KIO/KHTML. - -The main advantage of KchmViewer is non-English language support. Unlike -others, KchmViewer in most cases correctly detects help file encoding, -correctly shows tables of context of Russian, Korean, Chinese and Japanese -help files, and correctly searches in non-English help files (search for -MBCS languages - ja/ko/ch is still in progress). - -Completely safe and harmless. Does not support JavaScript in any way, -optionally warns you before opening an external web page, or switching to -another help file. Shows an appropriate image for every TOC entry. - -KchmViewer Has complete chm index support, including multiple index entries, -cross-links and parent/child entries in index as well as Persistent bookmarks -support. Correctly detects and shows encoding of any valid chm file. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --disable-rpath \ - --with-x \ - --with-kde \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -# Removes useless files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING FAQ README -%{tde_bindir}/kchmviewer -%{tde_tdelibdir}/kio_msits.la -%{tde_tdelibdir}/kio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png -%{tde_datadir}/services/msits.protocol - - -%Changelog -* Tue May 01 2012 Francois Andriot - 3.1.2-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot - 3.1.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec index 97744c8c4..d83cc2897 100644 --- a/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec +++ b/redhat/applications/kcmautostart/kcmautostart-14.0.0.spec @@ -1,63 +1,93 @@ -# Default version for this component -%define tde_pkg kchmviewer +# +# spec file for package kcmautostart (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 kcmautostart +%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-kcmautostart -Summary: Manage applications automatic startup. +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} Version: 1.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Manage applications automatic startup 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) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -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: autoconf automake libtool m4 BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 Requires: trinity-tdebase >= %{tde_version} + %description %{summary} -%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}} @@ -112,5 +142,5 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 1.0-5 +* Fri Jul 05 2013 Francois Andriot - 2:1.0-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec deleted file mode 100644 index 8212e91f3..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.1.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define kdecomp kchmviewer - -# 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-kcmautostart -Summary: Manage applications automatic startup. -Version: 1.0 -Release: 2%{?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: kcmautostart-3.5.13.tar.gz - -# [kcmautostart] Fix FTBFS with TDE 3.5.13 -Patch1: kcmautostart-3.5.13-ftbfs.patch -# [kcmautostart] Add French support -Patch2: kcmautostart-3.5.13-add_french.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-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: gcc-c++ - -Requires: trinity-kdebase - -%description -%{summary} - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -a 0 -n applications/kcmautostart -%patch1 -p1 -%patch2 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --disable-static - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang autostart - -%clean -%__rm -rf %{buildroot} - - -%files -f autostart.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{tde_tdelibdir}/kcm_autostart.la -%{tde_tdelibdir}/kcm_autostart.so -%{tde_tdeappdir}/autostart.desktop -%{tde_tdedocdir}/HTML/en/autostart/ - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 1.0-2 -- Initial release for TDE 3.5.13.1 - -* Thu May 10 2012 Francois Andriot - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec deleted file mode 100644 index 522deb769..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.spec +++ /dev/null @@ -1,116 +0,0 @@ -# Default version for this component -%define kdecomp kchmviewer - -# 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-kcmautostart -Summary: Manage applications automatic startup. -Version: 1.0 -Release: 1%{?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: kcmautostart-3.5.13.tar.gz - -# [kcmautostart] Fix FTBFS with TDE 3.5.13 -Patch1: kcmautostart-3.5.13-ftbfs.patch -# [kcmautostart] Add French support -Patch2: kcmautostart-3.5.13-add_french.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gcc-c++ - -Requires: trinity-kdebase - -%description -%{summary} - -%prep -%setup -q -a 0 -n applications/kcmautostart -%patch1 -p1 -%patch2 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --disable-static - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang autostart - -%clean -%__rm -rf %{buildroot} - - -%files -f autostart.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{tde_tdelibdir}/kcm_autostart.la -%{tde_tdelibdir}/kcm_autostart.so -%{tde_tdeappdir}/autostart.desktop -%{tde_tdedocdir}/HTML/en/autostart/ - - -%Changelog -* Thu May 10 2012 Francois Andriot - 1.0-1 -- Initial release for TDE 3.5.13 diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index b2b6646ce..3db90985e 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -1,47 +1,60 @@ -# Default version for this component -%define tde_pkg kcmldap +# +# spec file for package kcmldap (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 kcmldap +%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_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: Kerberos control module for the TDE control center +Epoch: %{tde_epoch} Version: 0.5 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ +Summary: Kerberos control module for the TDE control center 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) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -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 @@ -52,6 +65,29 @@ BuildRequires: trinity-libtdeldap-devel >= 0.5 Requires: trinity-tde-ldap-cert-updater = %{version}-%{release} Requires: trinity-kcontrol-ldap-bonding = %{version}-%{release} +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 + +# OPENLDAP support +%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: openldap-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif + + %description This is a meta-package that installs all kcmldap related packages. @@ -80,6 +116,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/kcm_ldapbonding.la %{tde_tdelibdir}/kcm_ldapbonding.so %{tde_tdeappdir}/ldapbonding.desktop +%dir %{tde_datadir}/pixmaps %{tde_datadir}/pixmaps/kcmldapbonding_step1.png %{tde_datadir}/pixmaps/kcmldapbonding_step3.png @@ -106,10 +143,12 @@ touch --no-create %{tde_datadir}/icons/hicolor || : ########## -%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}} @@ -122,7 +161,6 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -155,5 +193,5 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 0.5-1 +* Fri Jul 05 2013 Francois Andriot - 2:0.5-1 - Initial release for TDE 14.0.0