Branch: master

e9ee715a 2016-10-03 14:48:24 François Andriot
RPM packaging: fix tellico build dependency to poppler-devel
M redhat/applications/tellico/tellico-14.0.0.spec
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 6ee31ce..5f48161 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -74,6 +74,18 @@
 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 @@
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/tellico
-#%{tde_datadir}/pixmaps
 %{tde_datadir}/applications
 %{tde_confdir}/tellicorc
 
@@ -301,8 +312,8 @@
 %__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}