summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-01-30 14:34:02 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2021-01-30 22:29:41 +0100
commit6581dc50b83f203d65eac61c00a159ab2a6ddb5d (patch)
tree85c02d38ca9dcedc28798ee41c4b16ec7260e9bc /redhat/libraries
parent87e57a1a070839a44db16a0410ef57902db2df3e (diff)
downloadtde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.tar.gz
tde-packaging-6581dc50b83f203d65eac61c00a159ab2a6ddb5d.zip
RPM: massive update and cleanup
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec165
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec (renamed from redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec)2
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec155
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec (renamed from redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec)68
-rw-r--r--redhat/libraries/libkipi/libkipi-3.5.13.2.spec167
-rw-r--r--redhat/libraries/libkipi/libkipi.spec (renamed from redhat/libraries/libkipi/libkipi-14.0.0.spec)73
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec514
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec (renamed from redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec)16
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec (renamed from redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec)89
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec (renamed from redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec)4
-rw-r--r--redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch41
-rw-r--r--redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch11
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec225
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec (renamed from redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec)32
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch56
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch11
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec186
-rw-r--r--redhat/libraries/python-trinity/python-trinity.spec (renamed from redhat/libraries/python-trinity/python-trinity-14.0.0.spec)20
19 files changed, 182 insertions, 1655 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 6f953fb06..66d8f9eac 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg kipi-plugins
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
deleted file mode 100644
index 93e82bd9b..000000000
--- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define tde_pkg libkdcraw
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: Raw picture decoding C++ library (runtime) [Trinity]
-
-Epoch: 1
-Version: 0.1.9
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires: libtool-ltdl-devel
-%endif
-
-%description
-C++ interface around dcraw binary program used to decode RAW
-picture files.
-This library is used by kipi-plugins, digiKam and others kipi host programs.
-libkdcraw contains the library of libkdcraw.
-
-%package devel
-Group: Development/Libraries
-Summary: RAW picture decoding C++ library (development) [Trinity]
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Libkdcraw is a C++ interface around dcraw binary program used to
-decode Raw picture files.
-libkdcraw-devel contains development files and documentation. The
-library documentation is available on kdcraw.h header file.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdcraw.so.4
-%{tde_libdir}/libkdcraw.so.4.0.3
-%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkdcraw.so
-%{tde_libdir}/libkdcraw.la
-%{tde_tdeincludedir}/libkdcraw/
-%{tde_libdir}/pkgconfig/libkdcraw.pc
-
-%changelog
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index d3ad7ed60..06857a93b 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libkdcraw
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
deleted file mode 100644
index 38f08646a..000000000
--- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec
+++ /dev/null
@@ -1,155 +0,0 @@
-# Default version for this component
-%define tde_pkg libkexiv2
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: Qt like interface for the libexiv2 library (runtime) [Trinity]
-
-Epoch: 1
-Version: 0.1.7
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-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
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires: libtool-ltdl-devel
-%endif
-
-# EXIV2
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}exiv2-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: exiv2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libexiv2-devel
-%endif
-
-%description
-libkexif2 contains the library of libkexiv2.
-Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
-
-%package devel
-Group: Development/Libraries
-Summary: Qt like interface for the libexiv2 library (development) [Trinity]
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-libkexif2-devel contains development files and documentation for libkexiv2
-library. The library documentation is available on kexiv2.h header file.
-Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_libdir}/libkexiv2.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_libdir}/libkexiv2.so
-%{tde_libdir}/libkexiv2.la
-%{tde_tdeincludedir}/libkexiv2/
-%{tde_libdir}/pkgconfig/libkexiv2.pc
-
-
-%changelog
diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 26a35fb11..a463ecab3 100644
--- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libkexiv2
%define tde_prefix /opt/trinity
@@ -67,18 +67,10 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: cmake >= 2.8
BuildRequires: gettext
BuildRequires: gcc-c++
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires: libtool-ltdl-devel
-%endif
-
# EXIV2
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}exiv2-devel
@@ -90,6 +82,13 @@ BuildRequires: exiv2-devel
BuildRequires: libexiv2-devel
%endif
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+
%description
libkexif2 contains the library of libkexiv2.
Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
@@ -145,41 +144,44 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# RHEL4: pkgconfig files do not support 'URL' keyword .
-%if 0%{?rhel} == 4
-%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /"
-%endif
+%__make install DESTDIR=%{buildroot} -C build
%clean
diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
deleted file mode 100644
index 740aea3b1..000000000
--- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-# Default version for this component
-%define tde_pkg libkipi
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity]
-
-Epoch: 1
-Version: 0.1.5
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-%if 0%{?suse_version}
-BuildRequires: liblcms-devel
-%else
-BuildRequires: lcms-devel
-%endif
-BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig
-BuildRequires: gettext
-
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires: libtool-ltdl-devel
-%endif
-
-%description
-Libkipi is a library
- o that contains common routines and widget used by kipi-plugins
- o to ease implementation of the kipi-plugins interface in an application
- that wants to use kipi-plugins
-
-Homepage: http://www.kipi-plugins.org/
-
-
-%package devel
-Group: Development/Libraries
-Summary: library for apps that want to use kipi-plugins (development version) [Trinity]
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Libkipi is a library
- o that contains common routines and widget used by kipi-plugins
- o to ease implementation of the kipi-plugins interface in an application
- that wants to use kipi-plugins
-
-This package contains development files and documentation for libkipi library.
-Homepage: http://www.kipi-plugins.org/
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR || : ; source /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%postun
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{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,-)
-%{tde_libdir}/libkipi.so
-%{tde_libdir}/libkipi.la
-%{tde_tdeincludedir}/libkipi/
-%{tde_libdir}/pkgconfig/libkipi.pc
-
-%changelog
diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi.spec
index 010aafa52..b4be8c16e 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libkipi
%define tde_prefix /opt/trinity
@@ -82,14 +82,17 @@ BuildRequires: lcms-devel
# JPEG support
BuildRequires: libjpeg-devel
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}ltdl-devel
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220
-BuildRequires: libtool-ltdl-devel
-%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# CMAKE
+BuildRequires: cmake >= 2.8
%description
Libkipi is a library
@@ -161,37 +164,46 @@ Homepage: http://www.kipi-plugins.org/
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags}
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DSERVICETYPES_INSTALL_DIR="%{tde_datadir}/servicetypes" \
+ -DICON_INSTALL_DIR="%{tde_datadir}/icons" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
+ \
+ ..
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg}
@@ -200,7 +212,4 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-
-
-
%changelog
diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
deleted file mode 100644
index 9945da33c..000000000
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ /dev/null
@@ -1,514 +0,0 @@
-# Default version for this component
-%define tde_pkg libksquirrel
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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_appdir %{tde_datadir}/applications
-
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: Trinity image viewer
-Epoch: 1
-Version: 0.8.0
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Environment/Libraries
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: libksquirrel-3.5.13-detect_netpbm.patch
-Patch1: libksquirrel-3.5.13.2-fix_giflib5_support.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
-
-BuildRequires: gettext-devel
-BuildRequires: transfig
-BuildRequires: OpenEXR-devel
-BuildRequires: libtiff-devel
-
-%if 0%{?suse_version}
-BuildRequires: giflib-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel}
-BuildRequires: libungif-devel
-%endif
-
-# DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_djvu 1
-BuildRequires: djvulibre
-%endif
-
-# XMEDCON support
-%if 0%{?fedora}
-%define with_xmedcon 1
-BuildRequires: xmedcon
-BuildRequires: xmedcon-devel
-%endif
-
-# RSVG support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_svg 1
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: librsvg2
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: librsvg2-tools
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: librsvg
-%endif
-%if 0%{?suse_version}
-BuildRequires: rsvg-view
-BuildRequires: librsvg-devel
-%endif
-%endif
-
-# JASPER support
-%if 0%{?rhel} >=4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_jasper 1
-%if 0%{?suse_version}
-BuildRequires: libjasper-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jasper-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: jasper-devel
-%endif
-%endif
-
-# FREETYPE support
-%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_freetype 1
-%if 0%{?suse_version} == 1140
-BuildRequires: freetype2-devel
-%else
-BuildRequires: freetype-devel
-%endif
-%endif
-
-# WMF support
-BuildRequires: libwmf-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: netpbm
-%else
-BuildRequires: netpbm-progs
-%endif
-
-
-%description
-Runtime libraries for KSquirrel.
-
-
-%package devel
-Group: Development/Libraries
-Summary: Trinity image viewer
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-Development libraries for KSquirrel.
-
-
-%package tools
-Summary: Trinity image viewer
-Group: Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description tools
-Tools for KSquirrel.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .netpbm
-%patch1 -p1 -b .giflib5
-
-# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
-if [ -r /usr/include/freetype2/ftbitmap.h ]; then
- %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
- %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
-fi
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_includedir} \
- \
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- \
- %{?with_djvu:--enable-djvu}
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE README
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0
-%if 0%{?with_xmedcon}
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0
-%endif
-%if 0%{?with_djvu}
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_png.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_png.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0.8.0
-%if 0%{?with_svg}
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0.8.0
-%if 0%{?with_freetype}
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0.8.0
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0
-%{tde_libdir}/libksquirrel-libs-png.so.0
-%{tde_libdir}/libksquirrel-libs-png.so.0.0.0
-%{tde_libdir}/libksquirrel-libs.so.0
-%{tde_libdir}/libksquirrel-libs.so.0.8.0
-%{tde_datadir}/ksquirrel-libs/libkls_camera.so.ui
-%if 0%{?with_djvu}
-%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui
-%endif
-%if 0%{?with_svg}
-%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui
-%endif
-%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
-%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
-%{tde_datadir}/ksquirrel-libs/rgbmap
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_includedir}/ksquirrel-libs/error.h
-%{tde_includedir}/ksquirrel-libs/fileio.h
-%{tde_includedir}/ksquirrel-libs/fmt_codec_base.h
-%{tde_includedir}/ksquirrel-libs/fmt_defs.h
-%{tde_includedir}/ksquirrel-libs/fmt_types.h
-%{tde_includedir}/ksquirrel-libs/fmt_utils.h
-%{tde_includedir}/ksquirrel-libs/settings.h
-%{tde_libdir}/ksquirrel-libs/libkls_avs.la
-%{tde_libdir}/ksquirrel-libs/libkls_avs.so
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.la
-%{tde_libdir}/ksquirrel-libs/libkls_bmp.so
-%{tde_libdir}/ksquirrel-libs/libkls_camera.la
-%{tde_libdir}/ksquirrel-libs/libkls_camera.so
-%{tde_libdir}/ksquirrel-libs/libkls_cut.la
-%{tde_libdir}/ksquirrel-libs/libkls_cut.so
-%{tde_libdir}/ksquirrel-libs/libkls_dds.la
-%{tde_libdir}/ksquirrel-libs/libkls_dds.so
-%if 0%{?with_xmedcon}
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.la
-%{tde_libdir}/ksquirrel-libs/libkls_dicom.so
-%endif
-%if 0%{?with_djvu}
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.la
-%{tde_libdir}/ksquirrel-libs/libkls_djvu.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_eps.la
-%{tde_libdir}/ksquirrel-libs/libkls_eps.so
-%{tde_libdir}/ksquirrel-libs/libkls_fig.la
-%{tde_libdir}/ksquirrel-libs/libkls_fig.so
-%{tde_libdir}/ksquirrel-libs/libkls_fli.la
-%{tde_libdir}/ksquirrel-libs/libkls_fli.so
-%{tde_libdir}/ksquirrel-libs/libkls_gif.la
-%{tde_libdir}/ksquirrel-libs/libkls_gif.so
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.la
-%{tde_libdir}/ksquirrel-libs/libkls_hdr.so
-%{tde_libdir}/ksquirrel-libs/libkls_ico.la
-%{tde_libdir}/ksquirrel-libs/libkls_ico.so
-%{tde_libdir}/ksquirrel-libs/libkls_iff.la
-%{tde_libdir}/ksquirrel-libs/libkls_iff.so
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.la
-%{tde_libdir}/ksquirrel-libs/libkls_jbig.so
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.la
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.la
-%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so
-%{tde_libdir}/ksquirrel-libs/libkls_koala.la
-%{tde_libdir}/ksquirrel-libs/libkls_koala.so
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.la
-%{tde_libdir}/ksquirrel-libs/libkls_leaf.so
-%{tde_libdir}/ksquirrel-libs/libkls_lif.la
-%{tde_libdir}/ksquirrel-libs/libkls_lif.so
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.la
-%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so
-%{tde_libdir}/ksquirrel-libs/libkls_mac.la
-%{tde_libdir}/ksquirrel-libs/libkls_mac.so
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.la
-%{tde_libdir}/ksquirrel-libs/libkls_mdl.so
-%{tde_libdir}/ksquirrel-libs/libkls_mng.la
-%{tde_libdir}/ksquirrel-libs/libkls_mng.so
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.la
-%{tde_libdir}/ksquirrel-libs/libkls_mtv.so
-%{tde_libdir}/ksquirrel-libs/libkls_neo.la
-%{tde_libdir}/ksquirrel-libs/libkls_neo.so
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.la
-%{tde_libdir}/ksquirrel-libs/libkls_openexr.so
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.la
-%{tde_libdir}/ksquirrel-libs/libkls_pcx.so
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.la
-%{tde_libdir}/ksquirrel-libs/libkls_pi1.so
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.la
-%{tde_libdir}/ksquirrel-libs/libkls_pi3.so
-%{tde_libdir}/ksquirrel-libs/libkls_pix.la
-%{tde_libdir}/ksquirrel-libs/libkls_pix.so
-%{tde_libdir}/ksquirrel-libs/libkls_png.la
-%{tde_libdir}/ksquirrel-libs/libkls_png.so
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.la
-%{tde_libdir}/ksquirrel-libs/libkls_pnm.so
-%{tde_libdir}/ksquirrel-libs/libkls_psd.la
-%{tde_libdir}/ksquirrel-libs/libkls_psd.so
-%{tde_libdir}/ksquirrel-libs/libkls_psp.la
-%{tde_libdir}/ksquirrel-libs/libkls_psp.so
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.la
-%{tde_libdir}/ksquirrel-libs/libkls_pxr.so
-%{tde_libdir}/ksquirrel-libs/libkls_ras.la
-%{tde_libdir}/ksquirrel-libs/libkls_ras.so
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.la
-%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so
-%{tde_libdir}/ksquirrel-libs/libkls_sct.la
-%{tde_libdir}/ksquirrel-libs/libkls_sct.so
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.la
-%{tde_libdir}/ksquirrel-libs/libkls_sgi.so
-%{tde_libdir}/ksquirrel-libs/libkls_sun.la
-%{tde_libdir}/ksquirrel-libs/libkls_sun.so
-%if 0%{?with_svg}
-%{tde_libdir}/ksquirrel-libs/libkls_svg.la
-%{tde_libdir}/ksquirrel-libs/libkls_svg.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_tga.la
-%{tde_libdir}/ksquirrel-libs/libkls_tga.so
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.la
-%{tde_libdir}/ksquirrel-libs/libkls_tiff.so
-%if 0%{?with_freetype}
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.la
-%{tde_libdir}/ksquirrel-libs/libkls_ttf.so
-%endif
-%{tde_libdir}/ksquirrel-libs/libkls_utah.la
-%{tde_libdir}/ksquirrel-libs/libkls_utah.so
-%{tde_libdir}/ksquirrel-libs/libkls_wal.la
-%{tde_libdir}/ksquirrel-libs/libkls_wal.so
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.la
-%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.la
-%{tde_libdir}/ksquirrel-libs/libkls_wmf.so
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.la
-%{tde_libdir}/ksquirrel-libs/libkls_xbm.so
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.la
-%{tde_libdir}/ksquirrel-libs/libkls_xcf.so
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.la
-%{tde_libdir}/ksquirrel-libs/libkls_xcur.so
-%{tde_libdir}/ksquirrel-libs/libkls_xim.la
-%{tde_libdir}/ksquirrel-libs/libkls_xim.so
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.la
-%{tde_libdir}/ksquirrel-libs/libkls_xpm.so
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.la
-%{tde_libdir}/ksquirrel-libs/libkls_xwd.so
-%{tde_libdir}/libksquirrel-libs-png.la
-%{tde_libdir}/libksquirrel-libs-png.so
-%{tde_libdir}/libksquirrel-libs.la
-%{tde_libdir}/libksquirrel-libs.so
-%{tde_libdir}/pkgconfig/ksquirrellibs.pc
-%{tde_docdir}/ksquirrel-libs/
-
-%files tools
-%defattr(-,root,root,-)
-%{tde_bindir}/ksquirrel-libs-camera2ppm
-%{tde_bindir}/ksquirrel-libs-dcraw
-%if 0%{?with_xmedcon}
-%{tde_bindir}/ksquirrel-libs-dicom2png
-%endif
-%{tde_bindir}/ksquirrel-libs-fig2ppm
-%{tde_bindir}/ksquirrel-libs-iff2ppm
-%{tde_bindir}/ksquirrel-libs-leaf2ppm
-%{tde_bindir}/ksquirrel-libs-ljpeg2ppm
-%{tde_bindir}/ksquirrel-libs-ljpeg2ppm-s
-%{tde_bindir}/ksquirrel-libs-mac2ppm
-%{tde_bindir}/ksquirrel-libs-neo2ppm
-%{tde_bindir}/ksquirrel-libs-pi12ppm
-%{tde_bindir}/ksquirrel-libs-pi32ppm
-%if 0%{?with_svg}
-%{tde_bindir}/ksquirrel-libs-svg2png
-%endif
-%if 0%{?with_freetype}
-%{tde_bindir}/ksquirrel-libs-ttf2pnm
-%endif
-%{tde_bindir}/ksquirrel-libs-utah2ppm
-%{tde_bindir}/ksquirrel-libs-xcf2pnm
-%{tde_bindir}/ksquirrel-libs-xim2ppm
-
-
-%changelog
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 9254f1700..d2485f0ed 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} >= 23
+%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8
%define _hardened_ldflags %nil
%endif
@@ -26,7 +26,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libksquirrel
%define tde_prefix /opt/trinity
@@ -97,7 +97,7 @@ BuildRequires: OpenEXR-devel
BuildRequires: libtiff-devel
# GIF support
-%if 0%{?suse_version} || 0%{?fedora} >= 28
+%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: giflib-devel
%else
BuildRequires: libungif-devel
@@ -107,7 +107,7 @@ BuildRequires: libungif-devel
BuildRequires: libmng-devel
# DJVU support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1
BuildRequires: djvulibre
%endif
@@ -135,7 +135,11 @@ BuildRequires: librsvg2-tools
BuildRequires: librsvg
%endif
%if 0%{?suse_version}
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+BuildRequires: rsvg-convert
+%else
BuildRequires: rsvg-view
+%endif
BuildRequires: librsvg-devel
%endif
%endif
@@ -530,6 +534,10 @@ fi
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+%if 0%{?suse_version} >= 1550
+CXXFLAGS="${CXXFLAGS} -std=c++11"
+%endif
+
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index c13dbe2ae..297740616 100644
--- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -22,7 +22,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libtdeldap
%define tde_prefix /opt/trinity
@@ -64,9 +64,11 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gcc-c++
+BuildRequires: cmake >= 2.8
+BuildRequires: pkgconfig
-# AUTOTOOLS
-BuildRequires: automake autoconf libtool
+# LIBTOOL
+BuildRequires: automake
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%endif
@@ -94,12 +96,12 @@ BuildRequires: openldap24-libs-devel
%endif
# HEIMDAL support
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires: heimdal-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libheimdal-devel
-%endif
+#%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+#BuildRequires: heimdal-devel
+#%endif
+#%if 0%{?suse_version}
+#BuildRequires: libheimdal-devel
+#%endif
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -115,6 +117,15 @@ BuildRequires: libcom_err-devel
BuildRequires: %{_lib}ext2fs-devel
%endif
+# ACL support
+BuildRequires: libacl-devel
+
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
%description
LDAP interface library for TDE management modules.
@@ -154,54 +165,48 @@ libtdeldap-trinity-dev contains development files and documentation.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-extra_includes="%{_includedir}"
-extra_libs="%{_libdir}"
-
-if [ -d "%{_includedir}/openldap24" ]; then
- extra_includes="%{_includedir}/openldap24:${extra_includes}"
- extra_libs="%{_libdir}/openldap24:${extra_libs}"
-fi
-
-if [ -d "%{_includedir}/heimdal" ]; then
- extra_includes="%{_includedir}/heimdal:${extra_includes}"
- extra_libs="%{_libdir}/heimdal:${extra_libs}"
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
fi
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --with-extra-includes=${extra_includes} \
- --with-extra-libs=${extra_libs} \
+ ..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%clean
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index ab21298c0..738884fe6 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg libtqt-perl
%define tde_prefix /opt/trinity
@@ -166,7 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Unwanted files
%__rm -f %{buildroot}%{perl_archlib}/perllocal.pod
%__rm -f %{buildroot}%{perl_vendorarch}/auto/TQt/.packlist
-
+chmod u+w %{buildroot}%{perl_archlib}/vendor_perl/auto/TQt/TQt.so
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
deleted file mode 100644
index e02d15f98..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule 2012-09-08 17:33:05.000000000 +0000
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-02 19:19:40.185384207 +0000
-@@ -712,6 +712,8 @@
-
- # Build the 'stub' code.
- cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+ "extramodule": os.getenv("EXTRA_MODULE_DIR"),
-+ "pyqt_dir": self.pyqt_dir,
- "modulename": modulename,
- "factoryfunction": factoryfunction,
- "python_version": python_version}
-@@ -854,6 +856,8 @@
- #include <sip.h>
-
- #define MODULE_DIR "%(moduledir)s"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
-+#define PYQT_DIR "%(pyqt_dir)s"
- #define MODULE_NAME "%(modulename)s"
- #define FACTORY "%(factoryfunction)s"
- #define CPP_FACTORY %(factoryfunction)s
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI 2013-04-07 17:54:28.531813437 +0200
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2013-04-07 17:56:15.510529614 +0200
-@@ -903,6 +906,18 @@
- if(!pyize->appendToSysPath (path.latin1 ())) {
- return report_error ("***Failed to set sys.path\n");
- }
-+
-+ // Add the extra path to the python script to the interpreter search path.
-+ TQString extrapath = TQString(EXTRA_MODULE_DIR);
-+ if(!pyize->appendToSysPath (extrapath.latin1 ())) {
-+ return report_error ("***Failed to set extra sys.path\n");
-+ }
-+
-+ // Add the PYQT path to the python script to the interpreter search path.
-+ TQString pyqt_dir = TQString(PYQT_DIR);
-+ if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) {
-+ return report_error ("***Failed to set PYQT sys.path\n");
-+ }
-
- // Load the Python script.
- PyObject *pyModule = pyize->importModule ((char *)script.latin1 ());
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch
deleted file mode 100644
index 2d6863f65..000000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200
-+++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200
-@@ -539,7 +539,7 @@
- canidatepaths.append(os.path.join(kdedir,"include"))
- canidatepaths.append(os.path.join(install.prefix,"include"))
- canidatepaths.append('/opt/trinity/include')
-- canidatepaths.append('/opt/kde/include')
-+ canidatepaths.append('/opt/trinity/include/tde')
- self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
- if self.kde_inc_dir is None:
- raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
deleted file mode 100644
index 069af8cec..000000000
--- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
+++ /dev/null
@@ -1,225 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-pytdeextensions
-Summary: Python packages to support TDE applications (scripts) [Trinity]
-Version: 0.4.0
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.simonzone.com/software/pykdeextensions
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999]
-Patch2: pykdeextensions-3.5.13.2-fix_extra_module_dir.patch
-# [pykdeextensions] Fix include directory search location
-Patch5: pykdeextensions-3.5.13.2-fix_include_dir.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 stuff
-BuildRequires: python-qt3-devel
-BuildRequires: trinity-python-trinity-devel
-
-Requires: trinity-libpythonize0 = %{version}-%{release}
-
-Obsoletes: trinity-pykdeextensions < %{version}-%{release}
-Provides: trinity-pykdeextensions = %{version}-%{release}
-
-
-%description
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of TDE applications.
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_datadir}/apps/pykdeextensions/
-%{tde_tdedocdir}/HTML/en/pykdeextensions/
-%{python_sitearch}/*
-
-##########
-
-%package -n trinity-libpythonize0
-Summary: Python packages to support KDE applications (library) [Trinity]
-Group: Environment/Libraries
-
-%description -n trinity-libpythonize0
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of KDE applications.
-
-This package contains the libpythonize library files.
-
-%post -n trinity-libpythonize0
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0
-/sbin/ldconfig
-
-%files -n trinity-libpythonize0
-%defattr(-,root,root,-)
-%{tde_libdir}/libpythonize.so.*
-
-##########
-
-%package -n trinity-libpythonize0-devel
-Summary: Python packages to support KDE applications (development) [Trinity]
-Group: Development/Libraries
-Requires: trinity-libpythonize0 = %{version}-%{release}
-
-%description -n trinity-libpythonize0-devel
-PyTDE Extensions is a collection of software and Python packages
-to support the creation and installation of TDE applications.
-
-This package contains the libpythonize development files.
-
-%post -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%postun -n trinity-libpythonize0-devel
-/sbin/ldconfig
-
-%files -n trinity-libpythonize0-devel
-%defattr(-,root,root,-)
-%{tde_tdeincludedir}/*.h
-%{tde_libdir}/libpythonize.la
-%{tde_libdir}/libpythonize.so
-
-##########
-
-%package devel
-Summary: Meta-package to install all pytdeextensions development files
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: trinity-libpythonize0-devel = %{version}-%{release}
-
-%description devel
-%{summary}
-
-%files devel
-
-##########
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch2 -p1 -b .extramodule
-%patch5 -p1 -b .incdir
-
-# Changes library directory to 'lib64'
-# Also other fixes for distributions ...
-for f in src/*.py; do
- %__sed -i "${f}" \
- -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \
- -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \
- -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
- -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
- -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \
- -e 's|"/kde"|"/tde"|'
-done
-
-# Do not look for 'libpython2.x.so' (from -devel) package.
-# Instead look for versioned runtime library.
-LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)"
-if [ -f "%{_libdir}/${LIBPYTHON}" ]; then
- %__sed -i "src/kdedistutils.py" \
- -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
-fi
-
-# Set PyQt directory to actual directory
-%__sed -i "src/kdedistutils.py" \
- -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/python-qt3'|g" \
- -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/python-qt3\"|g"
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-%__mkdir_p build
-./setup.py build_libpythonize
-
-%install
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
-export PYTHONDONTWRITEBYTECODE=
-
-%__rm -rf %{buildroot}
-
-./setup.py install \
- --root=%{buildroot} \
- --prefix=%{tde_prefix} \
- --install-clib=%{tde_libdir} \
- --install-cheaders=%{tde_tdeincludedir} \
- -v
-
-# Removes BUILDROOT directory reference in installed files
-for f in \
- %{buildroot}%{tde_libdir}/libpythonize.la \
- %{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \
- %{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \
-; do
- %__sed -i "${f}" -e "s|%{buildroot}||g"
-:
-done
-
-# Moves PYTHON libraries to distribution directory
-%__mkdir_p %{buildroot}%{python_sitearch}
-%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch}
-%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages
-
-# Removes useless files
-%__rm -rf %{?buildroot}%{tde_libdir}/*.a
-
-# Fix permissions on include files
-%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index 88888da02..e6c806fac 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -15,12 +15,10 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg pytdeextensions
%define tde_prefix /opt/trinity
@@ -76,6 +74,18 @@ Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
BuildRequires: sip4-tqt-devel >= 4.10.5
Requires: sip4-tqt >= 4.10.5
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+
Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -185,13 +195,25 @@ fi
%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
%endif
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%__sed -i "app_templates/kcontrol_module/setup.py" \
+ "app_templates/kcontrol_module/src/kcontrol_module.py" \
+ "app_templates/kdeapp/setup.py" \
+ "app_templates/kdeapp/src/kdeapp.py" \
+ "app_templates/kdeutility/setup.py" \
+ "app_templates/kdeutility/src/kdeutility.py" \
+ "app_templates/tdeioslave/setup.py" \
+ "app_templates/tdeioslave/src/tdeioslave.py" \
+ -e "s|/usr/bin/python|/usr/bin/env python2|"
+%endif
+
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%__mkdir_p build
-./setup.py build_libpythonize
+%__python ./setup.py build_libpythonize
%install
@@ -203,7 +225,7 @@ export PYTHONDONTWRITEBYTECODE=
%__rm -rf %{buildroot}
-./setup.py install \
+%__python ./setup.py install \
--root=%{buildroot} \
--prefix=%{tde_prefix} \
--install-clib=%{tde_libdir} \
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
deleted file mode 100644
index fb41680f1..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI 2014-03-22 23:47:29.217935267 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip 2014-03-22 23:47:53.355370778 +0100
-@@ -153,10 +153,8 @@
- bool deleteGroup (const QString&, bool = 1, bool = 0);
- void setDollarExpansion (bool = 1);
- bool isDollarExpansion () const;
-- virtual void rollback (bool = 1);
- virtual void sync ();
- bool isDirty () const;
-- virtual void setReadOnly (bool);
- bool isReadOnly () const;
- bool hasKey (const QString&) const;
- virtual QMap<QString,QString> entryMap (const QString&) const = 0;
-@@ -182,6 +180,9 @@
- bool hasDefault (const QString&) const;
- %End
-
-+private:
-+ virtual void rollback (bool = 1);
-+ virtual void setReadOnly (bool);
-
- protected:
- void setLocale ();
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI 2014-03-22 23:56:28.448338190 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip 2014-03-22 23:58:44.540121011 +0100
-@@ -53,6 +53,8 @@
- virtual void keyPressEvent (QKeyEvent*);
- %End
-
-+private:
-+ virtual void setSource(const QString&);
-
- }; // class KActiveLabel
-
---- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI 2014-03-23 00:02:17.343077605 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip 2014-03-23 00:03:42.151069824 +0100
-@@ -54,6 +54,8 @@
- protected:
- virtual KPopupMenu* createPopupMenu ();
-
-+private:
-+ virtual bool eventFilter(QObject*, QEvent*);
- }; // class KPixmapRegionSelectorWidget
-
- %End
---- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI 2014-03-23 00:13:21.583382771 +0100
-+++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip 2014-03-23 00:17:02.715146838 +0100
-@@ -77,6 +77,8 @@
- virtual void addApplicationEvents (const QString&);
- virtual void clearApplicationEvents ();
-
-+private slots:
-+ virtual void slotDefault();
- }; // class KNotifyDialog
-
- %End
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
deleted file mode 100644
index 5921695e8..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-python-trinity-3.5.13.2/configure.py.ORI 2013-01-20 14:28:38.844683333 +0100
-+++ trinity-python-trinity-3.5.13.2/configure.py 2013-01-20 14:29:05.179062079 +0100
-@@ -410,7 +410,7 @@
-
- if not opt_kdeincdir:
- incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
-- incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
-+ incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # Red Hat
- opt_kdeincdir = search ("kapplication.h", incSearchPaths)
-
- def check_kde_installation():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
deleted file mode 100644
index 279346a1f..000000000
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ /dev/null
@@ -1,186 +0,0 @@
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-%define __arch_install_post %{nil}
-
-
-Name: trinity-python-trinity
-Summary: Trinity bindings for Python [Trinity]
-Version: 3.16.3
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-#URL: http://www.simonzone.com/software/pykdeextensions
-URL: http://www.trinitydesktop.org/
-
-Prefix: %{_prefix}
-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-3.5.13.2-fix_tde_includedir.patch
-# Fix "is private" FTBFS using SIP >= 4.15
-Patch2: python-trinity-3.5.13.2-fix_is_private.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: python-qt3-devel
-
-# SIP support
-%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
-# RHEL 4/5 comes with old version, so we brought ours ...
-BuildRequires: trinity-sip-devel
-%endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-sip
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires: sip-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: python-sip-devel
-%endif
-
-Obsoletes: python-trinity < %{version}-%{release}
-Provides: python-trinity = %{version}-%{release}
-
-%description
-Python binding module that provides wide access to the Trinity API,
-also known as PyTDE. Using this, you'll get (for example) classes
-from kio, kjs, khtml and kprint.
-
-
-%package devel
-Summary: Trinity bindings for Python - Development files and scripts [Trinity]
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-Obsoletes: python-trinity-devel < %{version}-%{release}
-Provides: python-trinity-devel = %{version}-%{release}
-
-%description devel
-Development .sip files with definitions of PyTDE classes. They
-are needed to build PyTDE, but also as building blocks of other
-packages based on them.
-The package also contains kdepyuic, a wrapper script around python-qt3's
-user interface compiler.
-
-
-%package doc
-Summary: Documentation and examples for PyTDE [Trinity]
-Group: Development/Libraries
-
-Obsoletes: python-trinity-doc < %{version}-%{release}
-Provides: python-trinity-doc = %{version}-%{release}
-
-%description doc
-General documentation and examples for PyTDE providing programming
-tips and working code you can use to learn from.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .inc
-%patch2 -p1 -b .private
-
-
-%build
-unset QTDIR QTINC QTLIB
-. /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LD_RUN_PATH="%{tde_libdir}"
-export KDEDIR=%{tde_prefix}
-
-export DH_OPTIONS
-
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
-
-%__python configure.py \
- -k %{tde_prefix} \
- -L %{_lib} \
- -v %{_datadir}/sip/trinity
-
-# Shitty hack to add LDFLAGS
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%__sed -i */Makefile \
- -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
-%endif
-
-# Shitty hack to fix issue with SIP >= 4.15
-%__sed -i "kfile/sipkfilepart0.cpp" \
- -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \
- -e "s| KFileIconView::clear()| KFileView::clear()|g" \
- -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \
- -e "s| KFileDetailView::clear()| KFileView::clear()|g"
-
-
-%__make %{_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-# Install documentation
-%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pykde*.py*
-
-%files devel
-%defattr(-,root,root,-)
-%{tde_bindir}/kdepyuic
-# The SIP files are outside TDE's prefix
-%{_datadir}/sip/trinity/
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
-
-
-%changelog
diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity.spec
index f969038f9..c70454f2b 100644
--- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -15,12 +15,10 @@
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
%endif
%define tde_pkg python-trinity
%define tde_prefix /opt/trinity
@@ -65,7 +63,17 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
-BuildRequires: python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550
+%global python python2
+%global __python %__python2
+%global python_sitearch %{python2_sitearch}
+%else
+%global python python
+%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+
BuildRequires: python-tqt-devel
Requires: python-tqt
@@ -139,6 +147,10 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
+%endif
+
%build
unset QTDIR QTINC QTLIB