summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec4
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec58
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec5
-rw-r--r--redhat/libraries/libkipi/libkipi.spec5
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec22
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec16
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec2
-rw-r--r--redhat/libraries/pytde/pytde.spec (renamed from redhat/libraries/python-trinity/python-trinity.spec)24
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec10
9 files changed, 90 insertions, 56 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 273410c95..602ae384d 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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg kipi-plugins
%define tde_prefix /opt/trinity
@@ -93,7 +93,7 @@ BuildRequires: libexiv2-devel
%endif
# GPOD (ipod) support
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gpod 1
BuildRequires: libgpod-devel >= 0.4.2
%endif
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index 415b85004..02afad0fc 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libkdcraw
%define tde_prefix /opt/trinity
@@ -56,10 +56,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+BuildRequires: trinity-cmake >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-filesystem >= %{tde_version}
-BuildRequires: automake autoconf libtool
+BuildRequires: libtool
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
BuildRequires: pkgconfig
@@ -161,38 +162,49 @@ library documentation is available on kdcraw.h header file.
%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}"
-
-# Warning: gcc-hidden-visibility causes FTBFS in digikam !
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+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}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_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 \
+ \
+ -DBUILD_ALL=ON \
+ -DBUILD_DOC=ON \
+ -DBUILD_TRANSLATIONS=ON \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ ..
-%__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
%find_lang %{tde_pkg}
diff --git a/redhat/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 5a91ade74..6b9b7b5a2 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libkexiv2
%define tde_prefix /opt/trinity
@@ -67,7 +67,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: cmake >= 2.8
+BuildRequires: trinity-cmake >= %{tde_version}
BuildRequires: gettext
BuildRequires: gcc-c++
@@ -159,6 +159,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec
index 3685be0a2..38eba2393 100644
--- a/redhat/libraries/libkipi/libkipi.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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libkipi
%define tde_prefix /opt/trinity
@@ -92,7 +92,7 @@ BuildRequires: libidn-devel
BuildRequires: openssl-devel
# CMAKE
-BuildRequires: cmake >= 2.8
+BuildRequires: trinity-cmake >= %{tde_version}
%description
Libkipi is a library
@@ -179,6 +179,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
diff --git a/redhat/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 4fe2672bd..f432c5e8f 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -26,7 +26,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libksquirrel
%define tde_prefix /opt/trinity
@@ -35,6 +35,7 @@
%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/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
@@ -324,6 +325,23 @@ This package contains the runtime libraries for KSquirrel.
%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui
%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui
%{tde_datadir}/ksquirrel-libs/rgbmap
+%{tde_mandir}/man1/ksquirrel-libs-camera2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-dcraw.1
+%{tde_mandir}/man1/ksquirrel-libs-dicom2png.1
+%{tde_mandir}/man1/ksquirrel-libs-fig2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-iff2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-leaf2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm-s.1
+%{tde_mandir}/man1/ksquirrel-libs-ljpeg2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-mac2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-neo2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi12ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-pi32ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-svg2png.1
+%{tde_mandir}/man1/ksquirrel-libs-ttf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-utah2ppm.1
+%{tde_mandir}/man1/ksquirrel-libs-xcf2pnm.1
+%{tde_mandir}/man1/ksquirrel-libs-xim2ppm.1
##########
@@ -534,7 +552,7 @@ fi
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
+%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34
CXXFLAGS="${CXXFLAGS} -std=c++11"
%endif
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index bebf5f63d..cf049df44 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libtdeldap
%define tde_prefix /opt/trinity
@@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gcc-c++
-BuildRequires: cmake >= 2.8
+BuildRequires: trinity-cmake >= %{tde_version}
BuildRequires: pkgconfig
# LIBTOOL
@@ -95,14 +95,6 @@ BuildRequires: openldap2-devel
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
-
# UDEV support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
%define with_tdehwlib 1
@@ -126,6 +118,9 @@ BuildRequires: libidn-devel
# OPENSSL support
BuildRequires: openssl-devel
+# KRB5 support
+BuildRequires: krb5-devel
+
%description
LDAP interface library for TDE management modules.
@@ -186,6 +181,7 @@ fi
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_INSTALL_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index 12c7b734e..729be4c3c 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl.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.9
+%define tde_version 14.0.13
%endif
%define tde_pkg libtqt-perl
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index 36621f7a6..ef7c94f19 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -1,5 +1,5 @@
#
-# spec file for package python-trinity (version R14)
+# spec file for package pytde (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -18,9 +18,9 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
%endif
-%define tde_pkg python-trinity
+%define tde_pkg pytde
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -74,8 +74,8 @@ BuildRequires: gcc-c++
BuildRequires: %{python}
BuildRequires: %{python}-devel
-BuildRequires: python-tqt-devel
-Requires: python-tqt
+BuildRequires: pytqt-devel
+Requires: pytqt
# SIP
BuildRequires: sip4-tqt-devel >= 4.10.5
@@ -83,6 +83,8 @@ Requires: sip4-tqt >= 4.10.5
Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release}
%description
Python binding module that provides wide access to the Trinity API,
@@ -103,8 +105,10 @@ Summary: Trinity bindings for Python - Development files and scripts
Group: Development/Libraries/Python
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: python-trinity-devel < %{version}-%{release}
-Provides: python-trinity-devel = %{version}-%{release}
+Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
Development .sip files with definitions of PyTDE classes. They
@@ -127,6 +131,8 @@ Group: Development/Libraries/Python
Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release}
%description doc
General documentation and examples for PyTDE providing programming
@@ -134,7 +140,7 @@ tips and working code you can use to learn from.
%files doc
%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/en/python-trinity/
+%{tde_tdedocdir}/HTML/en/pytde/
##########
@@ -174,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
# Install documentation
%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
-%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/
%clean
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index cf67a4b48..30c1f416c 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.9
+%define tde_version 14.0.13
%endif
%define tde_pkg pytdeextensions
%define tde_prefix /opt/trinity
@@ -62,11 +62,11 @@ BuildRequires: gettext
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
-BuildRequires: python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1
-BuildRequires: trinity-python-trinity-devel
+BuildRequires: pytqt-devel >= %{?epoch:%{epoch}:}3.18.1
+BuildRequires: trinity-pytde-devel
BuildRequires: trinity-pytqt-tools
-Requires: python-tqt
-Requires: trinity-python-trinity
+Requires: pytqt
+Requires: trinity-pytde
Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:00:31 +0000