RPM: update build scripts

pull/92/head
François Andriot 6 years ago
parent 57d58eb0ab
commit 2e5704596f

@ -5,6 +5,7 @@
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
@ -40,7 +41,6 @@ BuildArch: noarch
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils

@ -10,6 +10,7 @@
# TDE specific building variables # TDE specific building variables
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %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 Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: tqtinterface-devel
BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdebase-devel BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils

@ -17,6 +17,7 @@
# Default version for this component # Default version for this component
%define tde_pkg kaffeine-mozilla %define tde_pkg kaffeine-mozilla
%define tde_prefix /opt/trinity
%if "%{?tde_version}" == "" %if "%{?tde_version}" == ""
%define tde_version 14.0.0 %define tde_version 14.0.0
%endif %endif
@ -61,6 +62,11 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# Fix 'nspr' includes location # Fix 'nspr' includes location
Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch 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-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -136,6 +142,8 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README %doc AUTHORS ChangeLog COPYING README
# These files are installed outside TDE prefix # These files are installed outside TDE prefix
%dir %{_libdir}/mozilla
%dir %{_libdir}/mozilla/plugins
%{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.la
%{_libdir}/mozilla/plugins/kaffeineplugin.so %{_libdir}/mozilla/plugins/kaffeineplugin.so

@ -61,12 +61,21 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-koffice-devel
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool 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 # SUSE desktop files utility
%if 0%{?suse_version} %if 0%{?suse_version}

@ -67,6 +67,15 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
# IDN support
BuildRequires: libidn-devel
# ACL support
BuildRequires: libacl-devel
# OPENSSL support
BuildRequires: openssl-devel
# SUSE desktop files utility # SUSE desktop files utility
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -154,30 +163,7 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO %doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kooldock %{tde_bindir}/kooldock
%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-center.png %{tde_datadir}/apps/kooldock/
%{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}/icons/crystalsvg/16x16/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png

Loading…
Cancel
Save