diff options
author | albator <albator@arcadia.vtf> | 2011-11-24 23:47:54 +0100 |
---|---|---|
committer | albator <albator@arcadia.vtf> | 2011-11-24 23:47:54 +0100 |
commit | b90c8995428a95728d62ad0f1b477d2486654212 (patch) | |
tree | 9e62286a0ef81ba01d2d140cf39becc3c8ba23ec /redhat/kdegraphics | |
parent | 4d26b3bc3984739d812f22d751e3089de35293a0 (diff) | |
download | tde-packaging-b90c8995428a95728d62ad0f1b477d2486654212.tar.gz tde-packaging-b90c8995428a95728d62ad0f1b477d2486654212.zip |
RHEL/Fedora: TDE fixes, add applications, etc ....
Diffstat (limited to 'redhat/kdegraphics')
-rw-r--r-- | redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec index c7f170f7b..6ad18e8c2 100644 --- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec +++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -74,9 +74,7 @@ BuildRequires: OpenEXR-devel # kpdf BuildRequires: freetype-devel BuildRequires: poppler-devel -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: poppler-qt-devel -%endif +BuildRequires: poppler-qt-devel >= 0.12 BuildRequires: libpaper-devel # ksvg %if 0%{?with_ksvg} @@ -175,11 +173,8 @@ cd build -DWITH_LIBPAPER=ON \ -DWITH_TIFF=ON \ -DWITH_OPENEXR=ON \ -%if 0%{?rhel} && 0%{?rhel} <= 5 - -DWITH_PDF=OFF \ -%else -DWITH_PDF=ON \ -%endif + -DWITH_PDF=ON \ -DBUILD_ALL=ON \ .. @@ -340,7 +335,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mimelnk/*/* %{_libdir}/libkdeinit_*.so %{tde_libdir}/* -%doc %lang(en) %{tde_docdir}/HTML/en/* %files libs %defattr(-,root,root,-) @@ -354,9 +348,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files devel %defattr(-,root,root,-) -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -%{tde_includedir}/* -%endif +%{tde_includedir}/poppler-link-qt3.h +%{tde_includedir}/poppler-page-transition.h +%{tde_includedir}/poppler-qt.h %{_includedir}/dom/* %{_includedir}/ksvg/* %{_includedir}/kviewshell/* @@ -370,6 +364,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %exclude %{_libdir}/libdjvu.so %changelog +* Tue Nov 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Rebuild with poppler 0.12 for RHEL 5 +- Re-adds qt-poppler include files + * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Updates BuildRequires |