RPM packaging: update koffice, tdebase, tdegraphics

pull/3/head
François Andriot 10 years ago
parent 985dc0e053
commit 07d8f15f3a

@ -120,6 +120,9 @@ BuildRequires: libpaper-devel
# RUBY support
%if 0%{?with_ruby}
BuildRequires: ruby ruby-devel >= 1.8.1
%if 0%{?fedora} >= 19
BuildRequires: rubypick
%endif
%endif
# FREETYPE support

@ -36,7 +36,7 @@ Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.0.14
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: A TDE batch file renaming utility.
Summary: A TDE batch file renaming utility
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -2188,9 +2188,6 @@ already. Most users won't need this.
%{tdm_datadir}/themes/
%{tde_datadir}/config/%{tdm}
%dir %{_sysconfdir}/trinity/%{tdm}
%if 0%{?with_selinux_policy}
%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
%endif
%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
%{tde_tdedocdir}/HTML/en/%{tdm}/
%if 0%{?suse_version} == 0
@ -2262,12 +2259,13 @@ fi
%if 0%{?mgaversion} || 0%{?mdkversion}
%make_session
%endif
# SELINUX context for tdm
%if 0%{?with_selinux_policy}
/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
%endif
# SELINUX context for tdm
%if 0%{?fedora} == 21
%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
restorecon "%{tde_bindir}/tdm"

@ -193,7 +193,7 @@ BuildRequires: libdrm-devel
# OPENEXR support
BuildRequires: OpenEXR-devel
# poppler
# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
#BuildRequires: poppler-qt-devel >= 0.12

Loading…
Cancel
Save