From a615d19df88eb2e989316b480519161945dbc7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Nov 2018 21:34:48 +0100 Subject: RPM: merge redhat directory with master branch --- redhat/main/tdegraphics/tdegraphics-14.0.0.spec | 340 +++------------------ redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec | 15 +- .../main/tdegraphics/trinity-tdegraphics-rpmlintrc | 2 + 3 files changed, 50 insertions(+), 307 deletions(-) create mode 100644 redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc (limited to 'redhat/main/tdegraphics') diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec index c63d352a4..578aa0d02 100644 --- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdegraphics (version R14.0.0) +# spec file for package tdegraphics (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -12,15 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # -# Please submit bugfixes or comments via http:/www.trinitydesktop.org/ +# Please submit bugfixes or comments via http://www.trinitydesktop.org/ # # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -30,15 +33,10 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - Name: trinity-%{tde_pkg} Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Trinity Desktop Environment - Graphics Applications Group: Productivity/Graphics/Viewers URL: http://www.trinitydesktop.org/ @@ -56,6 +54,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -98,8 +97,11 @@ BuildRequires: libtiff-devel # PCRE support BuildRequires: pcre-devel +# ACL support +BuildRequires: libacl-devel + # GIF support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?fedora} >= 28 BuildRequires: giflib-devel %else BuildRequires: libungif-devel @@ -193,10 +195,15 @@ BuildRequires: libdrm-devel # OPENEXR support BuildRequires: OpenEXR-devel -# poppler +# POPPLER support +%define with_pdf 1 +%if 0%{?with_pdf} %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libpoppler-devel >= 0.12 +%else BuildRequires: poppler-devel >= 0.12 -#BuildRequires: poppler-qt-devel >= 0.12 +%endif %endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}poppler-devel @@ -204,11 +211,11 @@ BuildRequires: %{_lib}poppler-devel %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 -BuildRequires: trinity-poppler-qt3-devel >= 0.12 +%endif %endif # LCMS support -%if 0%{?suse_version} +%if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel %else BuildRequires: lcms-devel @@ -217,6 +224,9 @@ BuildRequires: lcms-devel # FRIBIDI support BuildRequires: fribidi-devel +# OPENSSL support +BuildRequires: openssl-devel + # kamera %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} %define build_kamera 1 @@ -258,7 +268,9 @@ Requires: trinity-ksvg = %{version}-%{release} Requires: trinity-kview = %{version}-%{release} Requires: trinity-kviewshell = %{version}-%{release} Requires: trinity-libkscan = %{version}-%{release} +%if 0%{?with_pdf} Requires: trinity-libpoppler-tqt = %{version}-%{release} +%endif %description Graphics applications for the Trinity Desktop Environment, including @@ -294,20 +306,6 @@ Group: Hardware/Camera This is a digital camera io_slave for TDE which uses gphoto2 and libgpio to allow access to your camera's pictures with the URL camera:/ -%post -n trinity-kamera -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kamera -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - %files -n trinity-kamera %defattr(-,root,root,-) %{tde_tdelibdir}/kcm_kamera.la @@ -346,20 +344,6 @@ picker. %{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png %{tde_tdedocdir}/HTML/en/kcoloredit/ -%post -n trinity-kcoloredit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kcoloredit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package kfile-plugins @@ -390,8 +374,10 @@ tags, etc. all from within the file manager). %{tde_tdelibdir}/tdefile_jpeg.so %{tde_tdelibdir}/tdefile_pcx.la %{tde_tdelibdir}/tdefile_pcx.so +%if 0%{?with_pdf} %{tde_tdelibdir}/tdefile_pdf.la %{tde_tdelibdir}/tdefile_pdf.so +%endif %{tde_tdelibdir}/tdefile_png.la %{tde_tdelibdir}/tdefile_png.so %{tde_tdelibdir}/tdefile_pnm.la @@ -419,7 +405,9 @@ tags, etc. all from within the file manager). %{tde_datadir}/services/tdefile_ico.desktop %{tde_datadir}/services/tdefile_jpeg.desktop %{tde_datadir}/services/tdefile_pcx.desktop +%if 0%{?with_pdf} %{tde_datadir}/services/tdefile_pdf.desktop +%endif %{tde_datadir}/services/tdefile_png.desktop %{tde_datadir}/services/tdefile_pnm.desktop %{tde_datadir}/services/tdefile_ps.desktop @@ -452,20 +440,6 @@ This program and KPart allow the user to display *.DVI files from TeX. %{tde_datadir}/services/kdvimultipage.desktop %{tde_tdedocdir}/HTML/en/kdvi/ -%post -n trinity-kdvi -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kdvi -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kfax @@ -485,20 +459,6 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz %{tde_tdedocdir}/HTML/en/kfax/ -%post -n trinity-kfax -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kfax -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kfaxview @@ -525,22 +485,6 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/services/kfaxmultipage_tiff.desktop %{tde_tdedocdir}/HTML/en/kfaxview/ -%post -n trinity-kfaxview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kfaxview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - ########## %package -n trinity-kgamma @@ -564,20 +508,6 @@ Homepage: http://kgamma.berlios.de/index2.php %{tde_datadir}/icons/hicolor/*/apps/kgamma.png %{tde_tdedocdir}/HTML/en/kgamma/ -%post -n trinity-kgamma -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kgamma -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kghostview @@ -608,22 +538,6 @@ online. %{tde_datadir}/services/kghostview_part.desktop %{tde_tdedocdir}/HTML/en/kghostview/ -%post -n trinity-kghostview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kghostview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - ########## %package -n trinity-tdeiconedit @@ -644,20 +558,6 @@ TDEIconedit allows you easily to create and edit icons. %{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png %{tde_tdedocdir}/HTML/en/tdeiconedit/ -%post -n trinity-tdeiconedit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-tdeiconedit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %if 0%{?build_kmrml} @@ -693,14 +593,6 @@ MRML server. %{tde_datadir}/services/mrml.protocol %{tde_datadir}/services/mrml_part.desktop -%post -n trinity-kmrml -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kmrml -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - %endif ########## @@ -733,20 +625,6 @@ Homepage: http://kolourpaint.sourceforge.net %{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz %{tde_tdedocdir}/HTML/en/kolourpaint/ -%post -n trinity-kolourpaint -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kolourpaint -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kooka @@ -773,16 +651,10 @@ Homepage: http://kooka.kde.org/ %{tde_bindir}/kooka %{tde_tdeappdir}/kooka.desktop %{tde_datadir}/apps/kooka/ -%{tde_datadir}/config/kookarc +%{tde_confdir}/kookarc %{tde_datadir}/icons/hicolor/*/apps/kooka.png %{tde_tdedocdir}/HTML/en/kooka/ -%post -n trinity-kooka -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kooka -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kpdf @@ -808,20 +680,6 @@ application. %{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz %{tde_datadir}/services/kpdf_part.desktop -%post -n trinity-kpdf -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpdf -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-kpovmodeler @@ -855,22 +713,6 @@ Homepage: http://www.kpovmodeler.org %{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.* %doc %{tde_tdedocdir}/HTML/en/kpovmodeler/ -%post -n trinity-kpovmodeler -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kpovmodeler -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - ########## %package -n trinity-kruler @@ -889,20 +731,6 @@ Kruler is a screen ruler (using pixels) and color measurement tool for KDE. %{tde_datadir}/icons/hicolor/*/apps/kruler.png %{tde_tdedocdir}/HTML/en/kruler/ -%post -n trinity-kruler -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kruler -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-ksnapshot @@ -922,20 +750,6 @@ The images can then be saved in a variety of formats. %{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz %{tde_tdedocdir}/HTML/en/ksnapshot/ -%post -n trinity-ksnapshot -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksnapshot -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - ########## %package -n trinity-ksvg @@ -967,12 +781,6 @@ application. %{tde_datadir}/services/svgthumbnail.desktop %{tde_datadir}/servicetypes/ksvgrenderer.desktop -%post -n trinity-ksvg -/sbin/ldconfig || : - -%postun -n trinity-ksvg -/sbin/ldconfig || : - ########## %package -n trinity-kview @@ -1029,22 +837,6 @@ as well. %{tde_datadir}/servicetypes/kimageviewercanvas.desktop %{tde_tdedocdir}/HTML/en/kview/ -%post -n trinity-kview -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kview -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - ########## %package -n trinity-kviewshell @@ -1081,20 +873,6 @@ DjVu images. %{tde_datadir}/services/djvumultipage.desktop %{tde_datadir}/servicetypes/tdemultipage.desktop -%post -n trinity-kviewshell -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-kviewshell -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - ########## %package -n trinity-libkscan @@ -1115,20 +893,6 @@ It provides an easy-to-use library, which allows you to access your scanner %{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png %{tde_datadir}/services/scanservice.desktop -%post -n trinity-libkscan -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-libkscan -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - ########## %package -n trinity-libkscan-devel @@ -1144,14 +908,9 @@ This package contains development files for Trinity's scanner library. %{tde_libdir}/libkscan.la %{tde_libdir}/libkscan.so -%post -n trinity-libkscan-devel -/sbin/ldconfig || : - -%postun -n trinity-libkscan-devel -/sbin/ldconfig || : - ########## +%if 0%{?with_pdf} %package -n trinity-libpoppler-tqt Summary: TQt support for Poppler Group: Productivity/Graphics/Viewers @@ -1167,15 +926,11 @@ This library is used by the Trinity graphics file plugins for PDF support. %files -n trinity-libpoppler-tqt %defattr(-,root,root,-) %{tde_libdir}/libpoppler-tqt.so.* - -%post -n trinity-libpoppler-tqt -/sbin/ldconfig || : - -%postun -n trinity-libpoppler-tqt -/sbin/ldconfig || : +%endif ########## +%if 0%{?with_pdf} %package -n trinity-libpoppler-tqt-devel Summary: Development files for TQt support for Poppler Group: Development/Libraries/Other @@ -1197,12 +952,7 @@ This package contains the development files needed to compile applications again %{tde_libdir}/libpoppler-tqt.la %{tde_libdir}/libpoppler-tqt.so %{tde_libdir}/pkgconfig/poppler-tqt.pc - -%post -n trinity-libpoppler-tqt-devel -/sbin/ldconfig || : - -%postun -n trinity-libpoppler-tqt-devel -/sbin/ldconfig || : +%endif ########## @@ -1215,7 +965,9 @@ Provides: trinity-kdegraphics-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: trinity-libkscan-devel = %{version}-%{release} +%if 0%{?with_pdf} Requires: trinity-libpoppler-tqt-devel = %{version}-%{release} +%endif %description devel This package contains the development files needed to compile @@ -1251,12 +1003,6 @@ applications against tdegraphics libraries. # cmake %{tde_datadir}/cmake/* -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - ########## %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 @@ -1275,6 +1021,15 @@ applications against tdegraphics libraries. # Fix applications icons %__sed -i "kooka/kooka.desktop" -e "s|^Icon=.*|Icon=kooka|" +# Fix FTBFS in RHEL 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%__sed -i "kpdf/xpdf/aconf.h" \ + -e "s|#define HAVE_MKSTEMPS 1|#define HAVE_MKSTEMPS 0|" +%__sed -i "tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt" \ + -e "/link_directories/ s|$|\n \${POPPLER_LIBRARY_DIRS}|" \ + -e "/{POPPLER_INCLUDE_DIRS/ s|$|\n \${POPPLER_INCLUDE_DIRS}/..|" +%endif + %build unset QTDIR QTINC QTLIB @@ -1304,6 +1059,7 @@ fi \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ @@ -1313,7 +1069,7 @@ fi %{?with_paper:-DWITH_LIBPAPER=ON} \ -DWITH_TIFF=ON \ -DWITH_OPENEXR=ON \ - -DWITH_PDF=ON \ + -DWITH_PDF=%{?with_pdf:ON}%{?!with_pdf:OFF} \ -DBUILD_ALL=ON \ -DBUILD_KUICKSHOW=OFF \ %{!?build_kmrml:-DBUILD_KMRML=OFF} \ @@ -1362,5 +1118,3 @@ popd %changelog -* Fri Jul 05 2013 Francois Andriot - 14.0.0-1 -- Initial release for TDE R14.0.0 diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec index f75915f34..a625a2b6a 100644 --- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec +++ b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec @@ -1,8 +1,3 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - %define tde_version 3.5.13.2 # TDE specific building variables @@ -22,7 +17,7 @@ Name: trinity-tdegraphics Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} License: GPL Summary: Trinity Desktop Environment - Graphics Applications @@ -1335,11 +1330,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot - 3.5.13.2-3 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot - 3.5.13.2-2 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 diff --git a/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc new file mode 100644 index 000000000..529351884 --- /dev/null +++ b/redhat/main/tdegraphics/trinity-tdegraphics-rpmlintrc @@ -0,0 +1,2 @@ +setBadness('library-without-ldconfig-postun', 0) +setBadness('library-without-ldconfig-postin', 0) -- cgit v1.2.1