summaryrefslogtreecommitdiffstats
path: root/redhat/applications/digikam/digikam-3.5.13.2.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/digikam/digikam-3.5.13.2.spec')
-rw-r--r--redhat/applications/digikam/digikam-3.5.13.2.spec42
1 files changed, 20 insertions, 22 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec
index 8af183e1b..ff084696c 100644
--- a/redhat/applications/digikam/digikam-3.5.13.2.spec
+++ b/redhat/applications/digikam/digikam-3.5.13.2.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: digital photo management application for TDE [Trinity]
Version: 0.9.6
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -44,20 +44,24 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: digikam-3.5.13.2-fix_png12_support.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= %{tde_version}
+BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: trinity-libkexiv2-devel >= %{tde_version}
-BuildRequires: trinity-libkdcraw-devel >= %{tde_version}
-BuildRequires: trinity-libkipi-devel >= %{tde_version}
+BuildRequires: desktop-file-utils
+
+BuildRequires: trinity-libkexiv2-devel
+BuildRequires: trinity-libkdcraw-devel
+BuildRequires: trinity-libkipi-devel
+
+BuildRequires: libtiff-devel
+BuildRequires: gettext
+
+# GPHOTO2 support
%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: gphoto2-devel
%else
BuildRequires: libgphoto2-devel
%endif
-BuildRequires: libtiff-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
# JASPER support
%if 0%{?suse_version}
@@ -77,9 +81,9 @@ BuildRequires: libexiv2-devel
BuildRequires: exiv2-devel
%endif
-Requires: trinity-libkexiv2 >= %{tde_version}
-Requires: trinity-libkdcraw >= %{tde_version}
-Requires: trinity-libkipi >= %{tde_version}
+Requires: trinity-libkexiv2
+Requires: trinity-libkdcraw
+Requires: trinity-libkipi
%description
An easy to use and powerful digital photo management
@@ -105,7 +109,7 @@ digiKam is based in part on the work of the Independent JPEG Group.
%package devel
Group: Development/Libraries
Summary: Development files for %{name}
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
%description devel
%{summary}
@@ -122,12 +126,6 @@ Requires: %{name} = %{version}
%patch1 -p1 -b .png12
%endif
-# 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|%{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"
%__make -f "admin/Makefile.common"
@@ -136,7 +134,6 @@ Requires: %{name} = %{version}
%build
unset QTDIR || : ; source /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
export KDEDIR="%{tde_prefix}"
%configure \
@@ -153,9 +150,7 @@ export KDEDIR="%{tde_prefix}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --disable-rpath \
- \
- --with-extra-includes=%{tde_tdeincludedir}/tqt
+ --enable-rpath
%__make %{?_smp_mflags} || %__make
@@ -319,6 +314,9 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%changelog
+* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7
+- Build for Fedora 19
+
* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6
- Rebuild with NDEBUG option