RHEL/Fedora: some more updates for MGA2/MDV2011 building

1 files changed, 55 insertions, 29 deletions

diff --git a/redhat/libraries/libkdcraw/trinity-libkdcraw.spec b/redhat/libraries/libkdcraw/trinity-libkdcraw.spec
index 8c8b7e589..323eb816b 100644
--- a/redhat/libraries/libkdcraw/trinity-libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/trinity-libkdcraw.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp libkdcraw
-%define version 3.5.13
-%define release 1
 
 # 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 %{_prefix}/share/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%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:	Raw picture decoding C++ library (runtime) [Trinity]
 
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.5.13
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Environment/Libraries
@@ -39,9 +45,16 @@ BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
 BuildRequires: desktop-file-utils
 BuildRequires: lcms-devel, libjpeg-devel, pkgconfig
-BuildRequires: automake autoconf libtool libtool-ltdl-devel
+BuildRequires: automake autoconf libtool
 BuildRequires: gettext
 
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}ltdl-devel
+%else
+BuildRequires:	libtool-ltdl-devel
+%endif
+
 %description
 C++ interface around dcraw binary program used to decode RAW
 picture files.
@@ -66,30 +79,36 @@ library documentation is available on kdcraw.h header file.
 
 # 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"
+%__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"
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
 
 %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_includedir}"
 
 %configure \
+	--datadir=%{tde_datadir} \
+	--libdir=%{tde_libdir} \
+	--includedir=%{tde_includedir} \
 	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+    --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%find_lang %{kdecomp}
 
 
 %clean
@@ -102,19 +121,26 @@ export PATH="%{_bindir}:${PATH}"
 %postun
 /sbin/ldconfig || :
 
-%files
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
-%{_datadir}/icons/*/*/*/kdcraw.png
-%{_datadir}/locale/*/LC_MESSAGES/libkdcraw.mo
+%{tde_libdir}/libkdcraw.so.4
+%{tde_libdir}/libkdcraw.so.4.0.3
+%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
-%{_libdir}/pkgconfig/*.pc
+%{tde_libdir}/libkdcraw.so
+%{tde_libdir}/libkdcraw.la
+%{tde_includedir}/libkdcraw/
+%{tde_libdir}/pkgconfig/libkdcraw.pc
 
 %Changelog
-* Sun Nov 06 2011 Francois Andriot <[email protected]> - 3.5.11-1
+* Sun Nov 06 2011 Francois Andriot <[email protected]> - 3.5.13-1
 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15