diff options
Diffstat (limited to 'redhat/libraries')
| -rw-r--r-- | redhat/libraries/kipi-plugins/kipi-plugins.spec | 33 | ||||
| -rw-r--r-- | redhat/libraries/libkdcraw/libkdcraw.spec | 65 | ||||
| -rw-r--r-- | redhat/libraries/libkexiv2/libkexiv2.spec | 11 | ||||
| -rw-r--r-- | redhat/libraries/libkipi/libkipi.spec | 22 | ||||
| -rw-r--r-- | redhat/libraries/libksquirrel/libksquirrel.spec | 121 | ||||
| -rw-r--r-- | redhat/libraries/libtdeldap/libtdeldap.spec | 34 | ||||
| -rw-r--r-- | redhat/libraries/libtqt-perl/libtqt-perl.spec | 4 | ||||
| -rw-r--r-- | redhat/libraries/pytde/pytde.spec (renamed from redhat/libraries/python-trinity/python-trinity.spec) | 52 | ||||
| -rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions.spec | 34 |
9 files changed, 258 insertions, 118 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 66d8f9eac..68bc75af8 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.1.0 +%define tde_version 14.1.2 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity @@ -79,7 +79,12 @@ BuildRequires: gettext BuildRequires: gcc-c++ # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # EXIV2 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -93,10 +98,14 @@ 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 +%if 0%{?mdkver} +BuildRequires: %{_lib}gpod-devel >= 0.4.2 +%else BuildRequires: libgpod-devel >= 0.4.2 %endif +%endif # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 @@ -107,16 +116,28 @@ BuildRequires: lcms-devel # GPHOTO2 support %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}gphoto-devel +%else BuildRequires: gphoto2-devel +%endif %else BuildRequires: libgphoto2-devel %endif # TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -127,9 +148,13 @@ BuildRequires: mesa-libGLU-devel %if 0%{?pclinuxos} BuildRequires: MesaGLU-devel %else +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -201,7 +226,7 @@ PicasaWebExport: Export pictures to Picasa web service %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" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index 06857a93b..e881fc9b8 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.1.0 +%define tde_version 14.1.2 %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-tde-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 @@ -73,7 +74,12 @@ BuildRequires: lcms-devel %endif # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # AUTOTOOLS %if 0%{?mgaversion} || 0%{?mdkversion} @@ -161,38 +167,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 -e 'cd build\|cd ${CMAKE_BUILD_DIR:-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 4cef24737..c44f92c28 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.1.0 +%define tde_version 14.1.2 %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-tde-cmake >= %{tde_version} BuildRequires: gettext BuildRequires: gcc-c++ @@ -86,7 +86,11 @@ BuildRequires: libexiv2-devel BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -149,7 +153,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -159,6 +163,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 ca99a2b9e..38e0d979c 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.1.0 +%define tde_version 14.1.2 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity @@ -80,19 +80,32 @@ BuildRequires: lcms-devel %endif # JPEG support -BuildRequires: libjpeg-devel +%if 0%{?mdkver} +%define libjpeg %{_lib}jpeg +%else +%define libjpeg libjpeg +%endif +BuildRequires: %{libjpeg}-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # CMAKE -BuildRequires: cmake >= 2.8 +BuildRequires: trinity-tde-cmake >= %{tde_version} %description Libkipi is a library @@ -169,7 +182,7 @@ Homepage: http://www.kipi-plugins.org/ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -179,6 +192,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..8168d4711 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.1.0 +%define tde_version 14.1.2 %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 @@ -70,8 +71,8 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: pkgconfig -# AUTOTOOLS -BuildRequires: automake autoconf libtool +# CMAKE +BuildRequires: cmake libtool %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel %endif @@ -91,33 +92,49 @@ BuildRequires: gettext BuildRequires: gettext-devel # OPENEXR support +%if 0%{?mdkver} +BuildRequires: %{_lib}openexr-devel +%else BuildRequires: OpenEXR-devel +%endif # TIFF support +%if 0%{?mdkver} +BuildRequires: %{_lib}tiff-devel +%else BuildRequires: libtiff-devel +%endif # GIF support %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -BuildRequires: giflib-devel +BuildRequires: giflib-devel %else -BuildRequires: libungif-devel +%if 0%{?mdkver} +BuildRequires: %{_lib}gif-devel +%else +BuildRequires: libungif-devel +%endif %endif # MNG support +%if 0%{?mdkver} +BuildRequires: %{_lib}mng-devel +%else BuildRequires: libmng-devel +%endif # DJVU support -%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%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 +#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} @@ -132,6 +149,9 @@ BuildRequires: librsvg2 BuildRequires: librsvg2-tools %endif %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}rsvg2-devel +%endif BuildRequires: librsvg %endif %if 0%{?suse_version} @@ -169,7 +189,11 @@ BuildRequires: freetype-devel %endif # WMF support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}wmf-devel +%else BuildRequires: libwmf-devel +%endif # XML2 support BuildRequires: libxml2-devel @@ -243,6 +267,8 @@ This package contains the runtime libraries for KSquirrel. %{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_msp.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_msp.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 @@ -310,7 +336,7 @@ This package contains the runtime libraries for KSquirrel. %{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-png.so.0.8.0 %{tde_libdir}/libksquirrel-libs.so.0 %{tde_libdir}/libksquirrel-libs.so.0.8.0 %dir %{tde_datadir}/ksquirrel-libs @@ -324,6 +350,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 ########## @@ -344,6 +387,7 @@ This package contains the development libraries for KSquirrel. %{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/ksquirrel_libs_export.h %{tde_includedir}/ksquirrel-libs/settings.h %{tde_libdir}/ksquirrel-libs/libkls_avs.la %{tde_libdir}/ksquirrel-libs/libkls_avs.so @@ -399,6 +443,8 @@ This package contains the development libraries for KSquirrel. %{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_msp.la +%{tde_libdir}/ksquirrel-libs/libkls_msp.so %{tde_libdir}/ksquirrel-libs/libkls_mtv.la %{tde_libdir}/ksquirrel-libs/libkls_mtv.so %{tde_libdir}/ksquirrel-libs/libkls_neo.la @@ -525,44 +571,47 @@ if [ -r /usr/include/freetype2/ftbitmap.h ]; then %__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 export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%if 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 8 || 0%{?fedora} >= 34 -CXXFLAGS="${CXXFLAGS} -std=c++11" -%endif +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-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_includedir} \ +%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}" \ + -DINCLUDE_INSTALL_DIR="%{tde_includedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - %{?with_djvu:--enable-djvu} + -DBUILD_ALL=ON \ + -DBUILD_DICOM=OFF \ + -DBUILD_PICT=OFF \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make -C build install DESTDIR=%{buildroot} %clean diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index 43886ccc4..80c14f13b 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.1.0 +%define tde_version 14.1.2 %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-tde-cmake >= %{tde_version} BuildRequires: pkgconfig # LIBTOOL @@ -77,17 +77,25 @@ BuildRequires: libtool-ltdl-devel %endif # SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +%if 0%{?mdkver} +BuildRequires: %{_lib}sasl-devel +%else BuildRequires: %{_lib}sasl2-devel %endif +%endif %if 0%{?suse_version} BuildRequires: cyrus-sasl-devel %endif # OPENLDAP support %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: lib64ldap-devel +%else BuildRequires: openldap-devel %endif +%endif %if 0%{?suse_version} BuildRequires: openldap2-devel %endif @@ -106,8 +114,12 @@ BuildRequires: libheimdal-devel # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 %define with_tdehwlib 1 +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}udev-devel +%else BuildRequires: libudev-devel %endif +%endif # LIBCOM_ERR support %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -118,13 +130,21 @@ BuildRequires: %{_lib}ext2fs-devel %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -176,7 +196,12 @@ if [ -d "/usr/include/openldap24" ]; then RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}" fi -if ! rpm -E %%cmake|grep -q "cd build"; then +# 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 -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi @@ -186,6 +211,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 42421f156..38ad6cce6 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.1.0 +%define tde_version 14.1.2 %endif %define tde_pkg libtqt-perl %define tde_prefix /opt/trinity @@ -122,7 +122,7 @@ It provides an object-oriented interface and is easy to use. %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" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__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" diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec index cde093dd8..23c576859 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.1.0 +%define tde_version 14.1.2 %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,17 @@ 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 +%if "%{python}" == "" +%global python python3 %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_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 +81,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 +93,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%{?mdkver} || 0%{?pclinuxos} || 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 +117,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 +141,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 +150,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 +163,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 +188,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..4cbfab470 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.1.0 +%define tde_version 14.1.2 %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} @@ -75,14 +75,12 @@ 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 +%if "%{python}" == "" +%global python python3 %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_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,20 +180,12 @@ 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" %endif -%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?mgaversion} >= 8 || 0%{?sle_version} >= 150600 %__sed -i "app_templates/kcontrol_module/setup.py" \ "app_templates/kcontrol_module/src/kcontrol_module.py" \ "app_templates/kdeapp/setup.py" \ @@ -204,7 +194,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 |