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.spec (renamed from redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec)2
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec (renamed from redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec)61
-rw-r--r--redhat/libraries/libkipi/libkipi.spec (renamed from redhat/libraries/libkipi/libkipi-14.0.0.spec)62
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec (renamed from redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec)12
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec (renamed from redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec)14
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec (renamed from redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec)2
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions.spec (renamed from redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec)18
-rw-r--r--redhat/libraries/python-trinity/python-trinity.spec (renamed from redhat/libraries/python-trinity/python-trinity-14.0.0.spec)17
9 files changed, 103 insertions, 87 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index 6f953fb06..9ad0b5e3b 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.0.7
%endif
%define tde_pkg kipi-plugins
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index d3ad7ed60..daa7f5c39 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.0.7
%endif
%define tde_pkg libkdcraw
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 26a35fb11..ce0ecd529 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.0.7
%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
@@ -145,41 +137,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 \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
+ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
+ -DLIB_INSTALL_DIR="%{tde_libdir}" \
+ \
+ -DWITH_ALL_OPTIONS=ON \
+ -DWITH_GCC_VISIBILITY=ON \
+ \
+ -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-14.0.0.spec b/redhat/libraries/libkipi/libkipi.spec
index 010aafa52..5c8e49c4f 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.0.7
%endif
%define tde_pkg libkipi
%define tde_prefix /opt/trinity
@@ -82,14 +82,8 @@ 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
+# CMAKE
+BuildRequires: cmake >= 2.8
%description
Libkipi is a library
@@ -120,7 +114,7 @@ Homepage: http://www.kipi-plugins.org/
%defattr(-,root,root,-)
%{tde_libdir}/libkipi.so.0
%{tde_libdir}/libkipi.so.0.1.1
-%{tde_datadir}/apps/kipi/
+%{tde_datadir}/kipi/
%{tde_datadir}/icons/hicolor/*/apps/kipi.png
%{tde_datadir}/servicetypes/kipiplugin.desktop
@@ -161,37 +155,45 @@ 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}" \
+ -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}
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index 9254f1700..f2476bc2c 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.0.7
%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
+BuildRequires: rsvg-convert
+%else
BuildRequires: rsvg-view
+%endif
BuildRequires: librsvg-devel
%endif
%endif
diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index c13dbe2ae..57207a80c 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.0.7
%endif
%define tde_pkg libtdeldap
%define tde_prefix /opt/trinity
@@ -94,12 +94,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
diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index ab21298c0..36577a66c 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.0.7
%endif
%define tde_pkg libtqt-perl
%define tde_prefix /opt/trinity
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec
index b8835c6d2..7a1919d30 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec
@@ -15,12 +15,11 @@
# 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.0.7
%endif
%define tde_pkg pytdeextensions
%define tde_prefix /opt/trinity
@@ -76,6 +75,15 @@ 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
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+
Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -185,7 +193,7 @@ fi
%__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g"
%endif
-%if 0%{?fedora} >= 30
+%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" \
@@ -203,7 +211,7 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%__mkdir_p build
-./setup.py build_libpythonize
+%__python ./setup.py build_libpythonize
%install
@@ -215,7 +223,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-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity.spec
index 51edd425b..30ed147c1 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.0.7
%endif
%define tde_pkg python-trinity
%define tde_prefix /opt/trinity
@@ -65,7 +63,16 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
# PYTHON support
-BuildRequires: python
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+
BuildRequires: python-tqt-devel
Requires: python-tqt
@@ -139,7 +146,7 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?fedora} >= 30
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|"
%endif