summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec2
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec3
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec3
-rw-r--r--redhat/libraries/libkipi/libkipi.spec3
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec18
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec8
-rw-r--r--redhat/libraries/pytde/pytde.spec (renamed from redhat/libraries/python-trinity/python-trinity.spec)50
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec30
8 files changed, 72 insertions, 45 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 66d8f9eac..a7fbe66a1 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -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 3f4464dac..05f951ecc 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -56,7 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-filesystem >= %{tde_version}
@@ -178,6 +178,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/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 858918854..5b6d29cc1 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -67,7 +67,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-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 3d66e9868..9eb9a7bc1 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -92,7 +92,7 @@ BuildRequires: libidn-devel
BuildRequires: openssl-devel
# CMAKE
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-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 4cfa2120f..f20dcbf71 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -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
##########
diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index d27b53dee..878c2fbd0 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -64,7 +64,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gcc-c++
-BuildRequires: trinity-cmake >= %{tde_version}
+BuildRequires: trinity-tde-cmake >= %{tde_version}
BuildRequires: pkgconfig
# LIBTOOL
@@ -176,6 +176,11 @@ if [ -d "/usr/include/openldap24" ]; then
RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
fi
+# heimdal pkgconfig (Fedora)
+if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then
+ PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}"
+fi
+
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
@@ -186,6 +191,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/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec
index cde093dd8..cfe105cbb 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
#
@@ -20,7 +20,7 @@
%if "%{?tde_version}" == ""
%define tde_version 14.1.0
%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
@@ -63,19 +63,15 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?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
+BuildRequires: pytqt-devel
+Requires: pytqt
# SIP
BuildRequires: sip4-tqt-devel >= 4.10.5
@@ -83,6 +79,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,
@@ -93,8 +91,20 @@ from tdeio, tdejs, tdehtml and tdeprint.
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so
-%{python_sitearch}/dcop*.py*
-%{python_sitearch}/pytde*.py*
+%if 0%{?rhel} == 7 || 0%{?suse_version}
+%{python_sitearch}/dcopexport.py*
+%{python_sitearch}/dcopext.py*
+%{python_sitearch}/pytdeconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/__pycache__/dcopexport.*.pyc
+%{python_sitearch}/__pycache__/dcopext.*.pyc
+%{python_sitearch}/__pycache__/pytdeconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/dcopexport.py
+%pycached %{python_sitearch}/dcopext.py
+%pycached %{python_sitearch}/pytdeconfig.py
+%endif
##########
@@ -105,6 +115,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{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 +139,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 +148,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/
##########
@@ -147,9 +161,7 @@ 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 || 0%{?mgaversion} >= 8
-%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
-%endif
+%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python3|"
%build
@@ -174,7 +186,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 000f79b48..edab0594a 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -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}
@@ -75,14 +75,10 @@ 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 || 0%{?mgaversion} >= 8
-%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)")}
+%global python python3
+%global __python %__python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -182,14 +178,6 @@ for f in src/*.py; do
-e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g"
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/tdedistutils.py" \
- -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|"
-fi
-
# Fix FTBFS on RHEL 5
%if 0%{?rhel} == 5
%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
@@ -204,7 +192,7 @@ fi
"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|"
+ -e "s|/usr/bin/python|/usr/bin/env %{python}|"
%endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 00:54:01 +0000