summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-10-03 21:48:24 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2016-10-03 21:48:24 +0200
commite9ee715aae06ea8b5cabfe855f13199109126260 (patch)
treefb95a4e332d3e9880789c6aaa2dda97c67077920
parent692cef71c325eadb7cb6562dd86c02ca85b3e865 (diff)
downloadtde-packaging-e9ee715aae06ea8b5cabfe855f13199109126260.tar.gz
tde-packaging-e9ee715aae06ea8b5cabfe855f13199109126260.zip
RPM packaging: fix tellico build dependency to poppler-devel
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec17
1 files changed, 14 insertions, 3 deletions
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 6ee31ce1b..5f48161c2 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -74,6 +74,18 @@ BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
+# POPPLER support
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+BuildRequires: poppler-devel >= 0.12
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}poppler-devel
+%endif
+%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
+# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
+BuildRequires: trinity-poppler-devel >= 0.12
+%endif
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@@ -159,7 +171,6 @@ It also makes it easy for other softwares to use the Tellico data.
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
%{tde_datadir}/applications
%{tde_confdir}/tellicorc
@@ -301,8 +312,8 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=$RPM_BUILD_ROOT -C build
# Add svg icons to xdg directories
-%__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+%__install -D -c -p -m 644 "icons/tellico.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg"
+%__install -D -c -p -m 644 "icons/tellico_mime.svg" "%{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg"
%find_lang %{tde_pkg}