diff options
Diffstat (limited to 'redhat/applications/digikam/trinity-digikam-3.5.13.spec')
| -rw-r--r-- | redhat/applications/digikam/trinity-digikam-3.5.13.spec | 206 |
1 files changed, 152 insertions, 54 deletions
diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13.spec b/redhat/applications/digikam/trinity-digikam-3.5.13.spec index cff40153c..6af36fa79 100644 --- a/redhat/applications/digikam/trinity-digikam-3.5.13.spec +++ b/redhat/applications/digikam/trinity-digikam-3.5.13.spec @@ -2,24 +2,30 @@ %define kdecomp digikam # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc -%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_appdir %{_datadir}/applications/kde -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: digital photo management application for KDE [Trinity] Version: 0.9.6 -Release: 2%{?dist}%{?_variant} +Release: 3%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -33,16 +39,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz -# TDE 3.5.13 on RHEL/Fedora specific patches -Patch1: digikam-3.5.13-jpegint-ftbfs.patch -# [digikam] Add support for libpng 1.4 [Bug #595] -Patch2: digikam-3.5.13-fix_libpng_1.4.patch -# [digikam] gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] -Patch3: digikam-3.5.13-libpng15+gcc47_1.patch -# [digikam] Fix libpng support (again !!!) -Patch4: digikam-3.5.13-fix_libpng_support.patch -# [digikam] Fix compilation with GCC 4.7 -Patch5: digikam-3.5.13-fix_gcc47_compilation.patch +# [digikam] Fix digikam FTBFS due to jpeg code [Commit #b9419cd5] +Patch1: digikam-3.5.13-fix_ftbfs_jpeg_code.patch +# [digikam] Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f] +Patch2: digikam-3.5.13-fix_ftbfs_png_code.patch +# [digikam] Remove version.h. Cruft from an older version prior to 0.9.6. +# Part of an extensive cleanup of various problems with kipi-plugins, digikam, +# and gwenview to resolve bug reports 241, 962, 963. +Patch3: digikam-3.5.13-remove_version_h.patch +# [digikam] Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7] +Patch4: digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch +# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a9489034] +Patch5: digikam-3.5.13-gcc_47_fix.patch +# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a209c81b] +Patch6: digikam-3.5.13-gcc_47_fix2.patch +# [digikam] Fix 'format not a string literal' error [Commit #029218cd] +Patch7: digikam-3.5.13-fix_fomat_not_string_literal.patch +# [digikam] Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853] +Patch8: digikam-3.5.13-fix_reinterpret_cast.patch +# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512] +Patch9: digikam-3.5.13-fix_ftbfs_png_015.patch +# [digikam] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011 +Patch10: digikam-3.5.13-missing_ldflags.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -53,15 +72,19 @@ BuildRequires: gettext BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkipi-devel -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: gphoto2-devel %else BuildRequires: libgphoto2-devel %endif BuildRequires: libtiff-devel BuildRequires: jasper-devel -BuildRequires: exiv2-devel +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}exiv2-devel +%else +BuildRequires: exiv2-devel +%endif %description An easy to use and powerful digital photo management @@ -95,19 +118,23 @@ Requires: %{name} = %{version} %prep %setup -q -n applications/%{kdecomp} -%patch1 -p5 +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -b .libpng -%if 0%{?fedora} >= 17 +%patch3 -p1 -E +%patch4 -p1 %patch5 -p1 -b .gcc47 -%endif +%patch6 -p1 -b .gcc47 +%patch7 -p1 -b .ftbfs +%patch8 -p1 +%patch9 -p1 -b .png015 +%patch10 -p1 -b .ftbfs + # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -116,37 +143,48 @@ Requires: %{name} = %{version} %build unset QTDIR || : ; source /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}" %configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ + --with-extra-includes=%{tde_tdeincludedir}/tqt \ --enable-closure %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +%find_lang %{kdecomp} + %clean %__rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : /sbin/ldconfig +update-desktop-database %{tde_appdir} 2> /dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : /sbin/ldconfig +update-desktop-database %{tde_appdir} 2> /dev/null || : %post devel /sbin/ldconfig @@ -155,32 +193,92 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : /sbin/ldconfig -%files +%files -f %{kdecomp}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING -%{_bindir}/* -%{_libdir}/*.so.* -%{tde_appdir}/*.desktop -%{_datadir}/locale/*/LC_MESSAGES/digikam.mo -%{_datadir}/services/*.desktop -%{_datadir}/services/*.protocol -%{_datadir}/servicetypes/digikamimageplugin.desktop -%{_datadir}/apps/*/ -%{tde_docdir}/HTML/en/*/ -%{_datadir}/icons/hicolor/*/*/* -%{_mandir}/man*/* -%{tde_libdir}/*.so -%{tde_libdir}/*.la +%{tde_bindir}/digikam +%{tde_bindir}/digikamthemedesigner +%{tde_bindir}/digitaglinktree +%{tde_bindir}/showfoto +%{tde_libdir}/libdigikam.so.0 +%{tde_libdir}/libdigikam.so.0.0.0 +%{tde_tdelibdir}/kio_digikamalbums.la +%{tde_tdelibdir}/kio_digikamalbums.so +%{tde_tdelibdir}/kio_digikamdates.la +%{tde_tdelibdir}/kio_digikamdates.so +%{tde_tdelibdir}/kio_digikamsearch.la +%{tde_tdelibdir}/kio_digikamsearch.so +%{tde_tdelibdir}/kio_digikamtags.la +%{tde_tdelibdir}/kio_digikamtags.so +%{tde_tdelibdir}/kio_digikamthumbnail.la +%{tde_tdelibdir}/kio_digikamthumbnail.so +%{tde_tdeappdir}/digikam.desktop +%{tde_tdeappdir}/showfoto.desktop +%{tde_datadir}/apps/digikam/ +%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop +%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop +%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop +%{tde_datadir}/apps/showfoto/ +%{tde_datadir}/icons/hicolor/*/apps/digikam.png +%{tde_datadir}/icons/hicolor/*/apps/showfoto.png +%{tde_datadir}/services/digikamalbums.protocol +%{tde_datadir}/services/digikamdates.protocol +%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop +%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop +%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop +%{tde_datadir}/services/digikamimageplugin_blurfx.desktop +%{tde_datadir}/services/digikamimageplugin_border.desktop +%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop +%{tde_datadir}/services/digikamimageplugin_charcoal.desktop +%{tde_datadir}/services/digikamimageplugin_colorfx.desktop +%{tde_datadir}/services/digikamimageplugin_core.desktop +%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop +%{tde_datadir}/services/digikamimageplugin_emboss.desktop +%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop +%{tde_datadir}/services/digikamimageplugin_freerotation.desktop +%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop +%{tde_datadir}/services/digikamimageplugin_infrared.desktop +%{tde_datadir}/services/digikamimageplugin_inpainting.desktop +%{tde_datadir}/services/digikamimageplugin_inserttext.desktop +%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop +%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop +%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop +%{tde_datadir}/services/digikamimageplugin_perspective.desktop +%{tde_datadir}/services/digikamimageplugin_raindrop.desktop +%{tde_datadir}/services/digikamimageplugin_restoration.desktop +%{tde_datadir}/services/digikamimageplugin_sheartool.desktop +%{tde_datadir}/services/digikamimageplugin_superimpose.desktop +%{tde_datadir}/services/digikamimageplugin_texture.desktop +%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop +%{tde_datadir}/services/digikamsearch.protocol +%{tde_datadir}/services/digikamtags.protocol +%{tde_datadir}/services/digikamthumbnail.protocol +%{tde_datadir}/servicetypes/digikamimageplugin.desktop +%{tde_mandir}/man*/* +%{tde_tdedocdir}/HTML/en/digikam-apidocs/ %files devel -%{_includedir}/*.h -%{_includedir}/digikam/ -%{_libdir}/*.so -%{_libdir}/*.la +%{tde_tdeincludedir}/digikam_export.h +%{tde_tdeincludedir}/digikam/ +%{tde_libdir}/libdigikam.so +%{tde_libdir}/libdigikam.la %Changelog +* Fri Aug 03 2012 Francois Andriot <[email protected]> - 0.9.6-3 +- Add support for Mageia 2 and Mandriva 2011 +- Removes old patches, adds GIT patches. +- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5] +- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f] +- Remove version.h. Cruft from an older version prior to 0.9.6. +- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7] +- GCC 4.7 fix. [Bug #958] [Commit #a9489034] +- GCC 4.7 fix. [Bug #958] [Commit #a209c81b] +- Fix 'format not a string literal' error [Commit #029218cd] +- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853] +- Fix FTBFS on png >= 0.15 [Commit #18ecd512] + * Sun Jul 08 2012 Francois Andriot <[email protected]> - 0.9.6-3 - Fix man directory location - Fix postinstall |