From 2e5704596f16c8c38edd53851eff53e3bb4cc5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 10 May 2019 22:54:19 +0200 Subject: [PATCH] RPM: update build scripts --- .../filelight-l10n/filelight-l10n.spec | 2 +- .../fusion-icon/fusion-icon-14.0.0.spec | 2 +- .../kaffeine-mozilla-14.0.0.spec | 8 +++++ redhat/applications/keximdb/keximdb.spec | 11 +++++- redhat/applications/kooldock/kooldock.spec | 34 ++++++------------- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 5feb96b8f..1525e5eb3 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -5,6 +5,7 @@ # TDE 3.5.13 specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -40,7 +41,6 @@ BuildArch: noarch Source0: %{kdecomp}-3.5.13.tar.gz -BuildRequires: tqtinterface-devel BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec index 8f2e0cd6d..7b48df033 100644 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec @@ -10,6 +10,7 @@ # TDE specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -37,7 +38,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: tqtinterface-devel BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec index f9d3be544..354af853e 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec @@ -17,6 +17,7 @@ # Default version for this component %define tde_pkg kaffeine-mozilla +%define tde_prefix /opt/trinity %if "%{?tde_version}" == "" %define tde_version 14.0.0 %endif @@ -61,6 +62,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix 'nspr' includes location Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -136,6 +142,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README # These files are installed outside TDE prefix +%dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/plugins %{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.so diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index 6627c48ec..70ea66b12 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -61,12 +61,21 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: trinity-koffice-devel + BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool -BuildRequires: trinity-koffice-devel +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index 647d511c7..3b0618ac0 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/redhat/applications/kooldock/kooldock.spec @@ -67,6 +67,15 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -154,30 +163,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_bindir}/kooldock -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/default/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-right.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png -%{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png +%{tde_datadir}/apps/kooldock/ %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png