diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec index 328667ac2..2fe2259d8 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec @@ -28,7 +28,7 @@ Summary: Raw picture decoding C++ library (runtime) [Trinity] Epoch: 1 Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -98,8 +98,8 @@ library documentation is available on kdcraw.h header file. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +# Warning: gcc-hidden-visibility causes FTBFS in digikam ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -113,7 +113,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --enable-final \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility + --disable-gcc-hidden-visibility %__make %{?_smp_mflags} @@ -170,5 +170,5 @@ done %{tde_libdir}/pkgconfig/libkdcraw.pc %Changelog -* Fri Jul 05 2013 Francois Andriot - 0.1.9-1 +* Fri Jul 05 2013 Francois Andriot - 1:0.1.9-2 - Initial release for TDE R14.0.0 diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index 6213ea369..310a4c130 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -28,7 +28,7 @@ Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] Epoch: 1 Version: 0.1.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -42,9 +42,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext @@ -159,5 +159,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Fri Jul 05 2013 Francois Andriot - 0.1.7-1 +* Fri Jul 05 2013 Francois Andriot - 0.1.7-2 - Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec index 144b1ad24..7e29d44fa 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec @@ -27,7 +27,7 @@ Summary: library for apps that want to use kipi-plugins (runtime version) [Trini Epoch: 1 Version: 0.1.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -103,7 +103,6 @@ Homepage: http://www.kipi-plugins.org/ %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -172,5 +171,5 @@ done %{tde_libdir}/pkgconfig/libkipi.pc %Changelog -* Fri Jul 05 2013 Francois Andriot - 0.1.5-1 +* Fri Jul 05 2013 Francois Andriot - 0.1.5-2 - Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index fc7d16e66..b22fda63c 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -14,7 +14,7 @@ %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} %define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadsir}/applications +%define tde_appdir %{tde_datadir}/applications %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: Trinity image viewer Epoch: 1 Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -79,6 +79,9 @@ BuildRequires: xmedcon-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif +%if 0%{?fedora} +BuildRequires: librsvg2-tools +%endif %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: librsvg %endif @@ -506,5 +509,5 @@ export PATH="%{tde_bindir}:${PATH}" %Changelog -* Fri Jul 05 2013 Francois Andriot - 0.8.0-1 +* Fri Jul 05 2013 Francois Andriot - 0.8.0-2 - Initial release for TDE 14.0.0 diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index 47ca83b17..6256383ba 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -40,7 +40,6 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: libtdeldap-14.0.0-ftbfs.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -48,7 +47,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +# OPENLDAP support +%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} BuildRequires: openldap-devel +%endif +%if 0%{?suse_version} +BuildRequires: openldap2-devel +%endif %description @@ -100,7 +105,6 @@ libtdeldap-trinity-dev contains development files and documentation. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs %__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" @@ -110,7 +114,6 @@ libtdeldap-trinity-dev contains development files and documentation. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index ce65682ee..18944cbbe 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -27,7 +27,7 @@ Name: trinity-pytdeextensions Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -172,7 +172,6 @@ fi %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__mkdir_p build ./setup.py build_libpythonize @@ -190,7 +189,8 @@ export PYTHONDONTWRITEBYTECODE= --root=%{buildroot} \ --prefix=%{tde_prefix} \ --install-clib=%{tde_libdir} \ - --install-cheaders=%{tde_tdeincludedir} -v + --install-cheaders=%{tde_tdeincludedir} \ + -v # Removes BUILDROOT directory reference in installed files for f in \ @@ -219,11 +219,5 @@ done %changelog -* Fri Jul 05 2013 Francois Andriot - 0.4.0-5 +* Fri Jul 05 2013 Francois Andriot - 0.4.0-6 - Initial build for TDE 14.0.0 - -* Mon Jun 03 2013 Francois Andriot - 0.4.0-4 -- Initial release for TDE 3.5.13.2 - -* Tue Oct 02 2012 Francois Andriot - 0.4.0-3 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index 2953c3937..4a90da275 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -28,7 +28,7 @@ Name: trinity-python-trinity Summary: Trinity bindings for Python [Trinity] Version: 3.16.3 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -43,15 +43,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# Fix include subdirectory 'tde' instead of 'kde' -Patch1: python-trinity-14.0.0-tde_includedir.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext +# PYTHON support BuildRequires: python BuildRequires: trinity-python-tqt-devel @@ -115,13 +113,12 @@ tips and working code you can use to learn from. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .inc %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +export LD_RUN_PATH="%{tde_libdir}" export DH_OPTIONS @@ -167,5 +164,5 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 3.16.3-1 +* Fri Jul 05 2013 Francois Andriot - 3.16.3-5 - Initial release for TDE 14.0.0