summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-03 21:34:00 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-03 21:34:00 +0200
commitc0c1a90179dd0f0e19549f279ee95cae7e577b82 (patch)
tree6ebeea5d799486d1c11361118b2878452f509cee /redhat/libraries
parent75c1b2f8bf7066e1b55c3168a78317373a56e711 (diff)
downloadtde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.tar.gz
tde-packaging-c0c1a90179dd0f0e19549f279ee95cae7e577b82.zip
RHEL/Fedora: some more updates for MGA2/MDV2011 building
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/libkdcraw/trinity-libkdcraw.spec84
-rw-r--r--redhat/libraries/libkexiv2/trinity-libkexiv2.spec84
-rw-r--r--redhat/libraries/libkipi/trinity-libkipi.spec80
3 files changed, 161 insertions, 87 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 <francois.andriot@free.fr> - 3.5.11-1
+* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/libraries/libkexiv2/trinity-libkexiv2.spec b/redhat/libraries/libkexiv2/trinity-libkexiv2.spec
index 598c432ba..d299cf0fb 100644
--- a/redhat/libraries/libkexiv2/trinity-libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/trinity-libkexiv2.spec
@@ -1,26 +1,32 @@
# Default version for this component
%define kdecomp libkexiv2
-%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: Qt like interface for the libexiv2 library (runtime) [Trinity]
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 3.5.13
+Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
@@ -34,13 +40,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-arts-devel
-BuildRequires: trinity-kdelibs-devel
+BuildRequires: tqtinterface-devel >= 3.5.13
+BuildRequires: trinity-arts-devel >= 3.5.13
+BuildRequires: trinity-tdelibs-devel >= 3.5.13
BuildRequires: desktop-file-utils
-BuildRequires: exiv2-devel
BuildRequires: gettext
-BuildRequires: automake autoconf libtool libtool-ltdl-devel
+BuildRequires: automake autoconf libtool
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}exiv2-devel
+BuildRequires: %{_lib}ltdl-devel
+%else
+BuildRequires: exiv2-devel
+BuildRequires: libtool-ltdl-devel
+%endif
%description
libkexif2 contains the library of libkexiv2.
@@ -63,27 +76,31 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
# 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 \
+ --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}
@@ -99,17 +116,24 @@ export PATH="%{_bindir}:${PATH}"
%postun
/sbin/ldconfig || :
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+
%files
%defattr(-,root,root,-)
-%{_libdir}/*.so.*
+%{tde_libdir}/libkexiv2.so.*
%files devel
%defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
-%{_libdir}/pkgconfig/*.pc
+%{tde_libdir}/libkexiv2.so
+%{tde_libdir}/libkexiv2.la
+%{tde_includedir}/libkexiv2/
+%{tde_libdir}/pkgconfig/libkexiv2.pc
%Changelog
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.11-1
+* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
diff --git a/redhat/libraries/libkipi/trinity-libkipi.spec b/redhat/libraries/libkipi/trinity-libkipi.spec
index 130fb1507..49c202b2d 100644
--- a/redhat/libraries/libkipi/trinity-libkipi.spec
+++ b/redhat/libraries/libkipi/trinity-libkipi.spec
@@ -1,26 +1,33 @@
# Default version for this component
%define kdecomp libkipi
-%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: library for apps that want to use kipi-plugins (runtime version) [Trinity]
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 3.5.13
+Release: 1%{?dist}%{?_variant}
License: GPLv2+
Group: Environment/Libraries
@@ -39,9 +46,15 @@ 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
Libkipi is a library
o that contains common routines and widget used by kipi-plugins
@@ -71,8 +84,8 @@ Homepage: http://www.kipi-plugins.org/
# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -80,21 +93,26 @@ Homepage: http://www.kipi-plugins.org/
%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
%__rm -rf %{buildroot}
@@ -106,21 +124,27 @@ 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}/apps/kipi/data/*.png
-%{_datadir}/icons/*/*/*/kipi.png
-%{_datadir}/locale/*/LC_MESSAGES/libkipi.mo
-%{_datadir}/servicetypes/kipiplugin.desktop
+%{tde_libdir}/libkipi.so.0
+%{tde_libdir}/libkipi.so.0.1.1
+%{tde_datadir}/apps/kipi/
+%{tde_datadir}/icons/hicolor/*/apps/kipi.png
+%{tde_datadir}/servicetypes/kipiplugin.desktop
%files devel
%defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/*
-%{_libdir}/pkgconfig/*.pc
+%{tde_libdir}/libkipi.so
+%{tde_libdir}/libkipi.la
+%{tde_includedir}/libkipi/
+%{tde_libdir}/pkgconfig/libkipi.pc
%Changelog
-* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.11-1
+* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15