From a615d19df88eb2e989316b480519161945dbc7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Nov 2018 21:34:48 +0100 Subject: RPM: merge redhat directory with master branch --- .../kbookreader/kbookreader-14.0.0.spec | 102 +++++++++++++-------- .../kbookreader/kbookreader-3.5.13.2.spec | 25 +---- 2 files changed, 68 insertions(+), 59 deletions(-) (limited to 'redhat/applications/kbookreader') diff --git a/redhat/applications/kbookreader/kbookreader-14.0.0.spec b/redhat/applications/kbookreader/kbookreader-14.0.0.spec index 1ed0a672d..e58bd0381 100644 --- a/redhat/applications/kbookreader/kbookreader-14.0.0.spec +++ b/redhat/applications/kbookreader/kbookreader-14.0.0.spec @@ -1,69 +1,101 @@ -# Default version for this component -%define tde_pkg kbookreader +# +# spec file for package kbookreader (version R14) +# +# 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 +%if "%{?tde_version}" == "" %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: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +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}} %__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" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -95,18 +127,18 @@ 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" -%clean -%__rm -rf %{buildroot} - +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer +%endif -%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 || : +%clean +%__rm -rf %{buildroot} %files @@ -114,7 +146,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 +154,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Jul 05 2013 Francois Andriot - 0.2.0-6 -- Initial release for TDE 14.0.0 diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec index e538652b3..61f8a726c 100644 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kbookreader %define tde_version 3.5.13.2 -# 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_datadir %{tde_prefix}/share @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: eBook reader for Trinity. Version: 0.2.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -63,7 +58,7 @@ within the Trinity Desktop Environment. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__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" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common @@ -121,19 +116,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot - 0.2.0-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 0.2.0-4 -- Initial release for TDE 3.5.13.2 - -* 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 -- cgit v1.2.1