diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec index 6a1659ace..78695b135 100644 --- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec +++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp libksquirrel -%define version 0.8.0 -%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%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}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: Trinity image viewer -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.8.0 +Release: 1%{?dist}%{?_variant} License: GPLv2+ Group: Environment/Libraries @@ -28,7 +35,7 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz @@ -36,19 +43,26 @@ Patch0: libksquirrel-3.5.13-detect_netpbm.patch Patch1: libksquirrel-3.5.13-fix_docdir.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gettext-devel BuildRequires: transfig -BuildRequires: netpbm-progs -%if 0%{?fedora} >= 15 -BuildRequires: xmedcon-devel BuildRequires: djvulibre +BuildRequires: xmedcon +BuildRequires: xmedcon-devel +BuildRequires: librsvg +BuildRequires: libwmf-devel + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: netpbm +%else +BuildRequires: netpbm-progs %endif + %description Runtime libraries for KSquirrel. @@ -79,8 +93,8 @@ Tools for KSquirrel. # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -88,18 +102,27 @@ Tools for KSquirrel. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_includedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-djvu %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -109,32 +132,281 @@ export PATH="%{_bindir}:${PATH}" %post -/sbin/ldconfig +/sbin/ldconfig || : %postun -/sbin/ldconfig +/sbin/ldconfig || : %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING LICENSE README -%{_libdir}/ksquirrel-libs/*.so.* -%{_libdir}/*.so.* -%{_datadir}/ksquirrel-libs +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0 +%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0 +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0 +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0 +%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0 +%{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 +%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui +%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui +%{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,-) -%{_includedir}/ksquirrel-libs -%{_libdir}/ksquirrel-libs/*.la -%{_libdir}/ksquirrel-libs/*.so -%{_libdir}/*.la -%{_libdir}/*.so -%{_libdir}/pkgconfig/ksquirrellibs.pc -%{_docdir}/ksquirrel-libs +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_dicom.la +%{tde_libdir}/ksquirrel-libs/libkls_dicom.so +%{tde_libdir}/ksquirrel-libs/libkls_djvu.la +%{tde_libdir}/ksquirrel-libs/libkls_djvu.so +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_svg.la +%{tde_libdir}/ksquirrel-libs/libkls_svg.so +%{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 +%{tde_libdir}/ksquirrel-libs/libkls_ttf.la +%{tde_libdir}/ksquirrel-libs/libkls_ttf.so +%{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,-) -%{_bindir}/* +%{tde_bindir}/ksquirrel-libs-camera2ppm +%{tde_bindir}/ksquirrel-libs-dcraw +%{tde_bindir}/ksquirrel-libs-dicom2png +%{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 +%{tde_bindir}/ksquirrel-libs-svg2png +%{tde_bindir}/ksquirrel-libs-ttf2pnm +%{tde_bindir}/ksquirrel-libs-utah2ppm +%{tde_bindir}/ksquirrel-libs-xcf2pnm +%{tde_bindir}/ksquirrel-libs-xim2ppm %Changelog diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch new file mode 100644 index 000000000..40177c2e2 --- /dev/null +++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch @@ -0,0 +1,31 @@ +--- pykdeextensions/src/kdedistutils.py.ori 2012-08-05 09:04:21.430039677 +0000 ++++ pykdeextensions/src/kdedistutils.py 2012-08-05 09:04:33.013847354 +0000 +@@ -820,7 +820,7 @@ + linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") + linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") + linklist.append("-lm") +- linklist.append("-lstdc++") ++# linklist.append("-lstdc++") + linklist.append("-lc") + linklist.append(self.clib) + +@@ -1734,7 +1734,7 @@ + linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize") + linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt") + linklist.append("-lm") +- linklist.append("-lstdc++") ++# linklist.append("-lstdc++") + linklist.append("-lc") + linklist.append(self.clib) + +--- pykdeextensions/setup.py.ORI 2012-08-05 09:07:01.588332389 +0000 ++++ pykdeextensions/setup.py 2012-08-05 09:07:07.795225579 +0000 +@@ -223,7 +223,7 @@ + linklist.extend(sysconfig.get_config_var("LIBS").split()) + + linklist.append("-lm") +- linklist.append("-lstdc++") ++# linklist.append("-lstdc++") + linklist.append("-lc") + linklist.append(self.clib) + diff --git a/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch new file mode 100644 index 000000000..b7db0c21c --- /dev/null +++ b/redhat/libraries/pykdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch @@ -0,0 +1,53 @@ +commit 32d597f993f2566f7bdfec8a29c916b4c9b1a803 +Author: Darrell Anderson +Date: 1339639807 -0500 + + Reverse an old Debian-specific patch that prevents building on + some 64-bit systems. Add text to help with basic debugging. + +diff --git a/setup.py b/setup.py +index e51f0fa..e7ec147 100755 +--- a/setup.py ++++ b/setup.py +@@ -135,7 +135,7 @@ class BuildLibpythonize(Command): + if self.clib!=None: + self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0] + if self.clib is None: +- raise SystemExit, "Failed to find a suitable libgcc library" ++ raise SystemExit, "setup.py: Failed to find a suitable libgcc library" + self.announce("Using %s for clib" % self.clib) + + # Make a list of places to look for python .so modules +diff --git a/src/kdedistutils.py b/src/kdedistutils.py +index b8b3743..b8e23f3 100644 +--- a/src/kdedistutils.py ++++ b/src/kdedistutils.py +@@ -660,7 +660,7 @@ class BuildKControlModule(Command): + if self.clib!=None: + self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0] + if self.clib is None: +- raise SystemExit, "Failed to find a suitable libgcc library" ++ raise SystemExit, "kdedistutils.py (1): Failed to find a suitable libgcc library" + self.announce("Using %s for clib" % self.clib) + + # Make a list of places to look for python .so modules +@@ -1591,7 +1591,7 @@ class BuildKioslave(Command): + if self.clib!=None: + self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0] + if self.clib is None: +- raise SystemExit, "Failed to find a suitable libgcc library" ++ raise SystemExit, "kdedistutils.py (2): Failed to find a suitable libgcc library" + self.announce("Using %s for clib" % self.clib) + + # Make a list of places to look for python .so modules +@@ -2229,7 +2229,7 @@ def compile_qtdesigner(ui_files, + + ########################################################################### + def get_libdir_name(): +- #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']: +- # return 'lib64' +- #else: ++ if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']: ++ return 'lib64' ++ else: + return 'lib' diff --git a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec index 9a6a44d8c..1ecd8085a 100644 --- a/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec +++ b/redhat/libraries/pykdeextensions/trinity-pykdeextensions.spec @@ -1,20 +1,30 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%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}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity -Name: trinity-pykdeextensions -Summary: Python packages to support KDE applications (scripts) [Trinity] +%define _docdir %{tde_docdir} + + + +Name: trinity-pytdeextensions +Summary: Python packages to support TDE applications (scripts) [Trinity] Version: 0.4.0 Release: 2%{?dist}%{?_variant} @@ -25,28 +35,47 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.simonzone.com/software/pykdeextensions -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: pykdeextensions-3.5.13.tar.gz + + + # [pykdeextensions] Fix KCM modules versioning [Bug #999] Patch1: pykdeextensions-3.5.13-fix_libtool.patch # [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999] Patch2: pykdeextensions-3.5.13-fix_extra_module_dir.patch +# [pykdeextensions] Reverse an old Debian-specific patch that prevents building on +# some 64-bit systems. Add text to help with basic debugging. [Commit #32d597f9] +Patch3: pykdeextensions-3.5.13-fix_libsuffix.patch +# [pykdeextensions] Do not link with stdc++ +Patch4: pykdeextensions-3.5.13-do_not_link_stdc++.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: python-trinity-devel + +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-qt +%else %if 0%{?rhel} == 5 BuildRequires: trinity-PyQt-devel %else BuildRequires: PyQt-devel %endif +%endif + +Requires: trinity-libpythonize0 = %{version}-%{release} + +Obsoletes: trinity-pykdeextensions < %{version}-%{release} +Provides: trinity-pykdeextensions = %{version}-%{release} + %description PyKDE Extensions is a collection of software and Python packages @@ -67,7 +96,7 @@ This package contains the libpythonize library files. %package -n trinity-libpythonize0-devel Summary: Python packages to support KDE applications (development) [Trinity] Group: Development/Libraries -Requires: trinity-libpythonize0 +Requires: trinity-libpythonize0 = %{version}-%{release} %description -n trinity-libpythonize0-devel PyKDE Extensions is a collection of software and Python packages @@ -80,42 +109,49 @@ This package contains the libpythonize development files. %setup -q -n libraries/pykdeextensions %patch1 -p1 -b .libtool %patch2 -p1 -b .extramodule +%patch3 -p1 -b .libsuffix +%patch4 -p1 -b .stdc++ # Changes library directory to 'lib64' for f in src/*.py; do %__sed -i "${f}" \ - -e "s|%{_prefix}/lib/|%{_libdir}/|g" \ + -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \ -e "s|/usr/lib/pyshared/python2.6|%{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|/usr/include/tqt|%{_includedir}/tqt|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" done %build unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt ./setup.py build_libpythonize %install unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt +# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia +export PYTHONDONTWRITEBYTECODE= + %__rm -rf %{buildroot} + + ./setup.py install \ --root=%{buildroot} \ - --prefix=%{_prefix} \ - --install-clib=%{_libdir} \ - --install-cheaders=%{tde_includedir} + --prefix=%{tde_prefix} \ + --install-clib=%{tde_libdir} \ + --install-cheaders=%{tde_tdeincludedir} # Removes BUILDROOT directory reference in installed files for f in \ - %{buildroot}%{_libdir}/libpythonize.la \ - %{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \ - %{buildroot}%{_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \ + %{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" : @@ -123,44 +159,54 @@ done # Moves PYTHON libraries to distribution directory %__mkdir_p %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch} -%__rm -rf %{buildroot}%{_prefix}/lib/python*/site-packages +%__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} -%post -n trinity-libpythonize0 -p /sbin/ldconfig -%postun -n trinity-libpythonize0 -p /sbin/ldconfig +%post -n trinity-libpythonize0 +/sbin/ldconfig + +%postun -n trinity-libpythonize0 +/sbin/ldconfig + +%post -n trinity-libpythonize0-devel +/sbin/ldconfig -%post -n trinity-libpythonize0-devel -p /sbin/ldconfig -%postun -n trinity-libpythonize0-devel -p /sbin/ldconfig +%postun -n trinity-libpythonize0-devel +/sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO -%{_datadir}/apps/pykdeextensions -%{tde_docdir}/HTML/en/pykdeextensions +%{tde_datadir}/apps/pykdeextensions +%{tde_tdedocdir}/HTML/en/pykdeextensions %{python_sitearch}/* %files -n trinity-libpythonize0 %defattr(-,root,root,-) -%{_libdir}/libpythonize.so.* +%{tde_libdir}/libpythonize.so.* %files -n trinity-libpythonize0-devel %defattr(-,root,root,-) -%{tde_includedir}/*.h -%{_libdir}/libpythonize.a -%{_libdir}/libpythonize.la -%{_libdir}/libpythonize.so +%{tde_tdeincludedir}/*.h +%{tde_libdir}/libpythonize.la +%{tde_libdir}/libpythonize.so %Changelog -* Fri May 11 2012 Francois Andriot - 0.8.0svn20080103-2 +* Fri May 11 2012 Francois Andriot - 0.4.0-2 - Fix KCM modules versioning [Bug #999] - Fix hardcoded path to Guidance python libraries [Bug #999] -* Thu Dec 01 2011 Francois Andriot - 0.8.0svn20080103-1 +* Thu Dec 01 2011 Francois Andriot - 0.4.0-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch new file mode 100644 index 000000000..7769b4f27 --- /dev/null +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch @@ -0,0 +1,11 @@ +--- python-trinity/configure.py.ORI 2012-08-05 00:02:51.785715468 +0200 ++++ python-trinity/configure.py 2012-08-05 00:03:02.312464939 +0200 +@@ -513,7 +513,7 @@ + + for file in dist: + if file.find ("andrake") > 0: +- kde_sip_flags.remove ("ALL") ++ kde_sip_flags.pop() + kde_sip_flags.append ("D_MANDRAKE") + + def set_sip_flags(): diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch deleted file mode 100644 index dd2877616..000000000 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python-trinity/configure.py.ORI 2012-05-12 10:52:21.457246722 +0200 -+++ python-trinity/configure.py 2012-05-12 10:52:43.558700741 +0200 -@@ -74,7 +74,7 @@ - kde_version_extra = None - kde_max_version = 0x030503 - --sip_min_v4_version = 0x040900 -+sip_min_v4_version = 0x040400 - qt_min_version = 0x030200 - pyqt_min_version = 0x031000 - diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec index 0adf450ff..00dc3cf26 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -1,16 +1,27 @@ %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%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}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +%define __arch_install_post %{nil} Name: python-trinity @@ -32,9 +43,11 @@ Source0: python-trinity-3.5.13.tar.gz ## RHEL/Fedora patches Patch1: python-trinity-3.5.13-install_directories.patch - # [python-trinity] Fix compilation with GCC 4.7 Patch2: python-trinity-3.5.13-fix_gcc47_compilation.patch +# [python-trinity] Fix Mandrake detection function +Patch3: python-trinity-3.5.13-fix_mandrake_detection.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -44,14 +57,19 @@ BuildRequires: gettext BuildRequires: python +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +BuildRequires: python-qt +%else %if 0%{?rhel} == 5 +# RHEL 5 comes with old version, so we brought ours ... BuildRequires: trinity-sip-devel BuildRequires: trinity-PyQt-devel %else BuildRequires: sip-devel BuildRequires: PyQt-devel %endif - +%endif %description Python binding module that provides wide access to the Trinity API, @@ -84,32 +102,44 @@ tips and working code you can use to learn from. %setup -q -n libraries/python-trinity %patch1 -p1 %patch2 -p1 +%patch3 -p1 + # Hack to get TQT include files under /opt %__sed -i "configure.py" \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" + %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +export LDFLAGS="${LDFLAGS} -lpython2.7" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt %__python configure.py \ - -k %{_prefix} \ + -k %{tde_prefix} \ -L %{_lib} \ -v %{_datadir}/sip/trinity +%if 0%{?mgaversion} || 0%{?mdkversion} +# Shitty hack to add LDFLAGS +%__sed -i */Makefile \ + -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|" +%endif + %__make %{_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} # Install documentation -%__mkdir_p %{buildroot}%{tde_docdir}/HTML/en -%__cp -rf doc %{buildroot}%{tde_docdir}/HTML/en/%{name} +%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ +%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/ @@ -127,12 +157,13 @@ export PATH="%{_bindir}:${PATH}" %files devel %defattr(-,root,root,-) -%{_bindir}/kdepyuic -%{_datadir}/sip/trinity +%{tde_bindir}/kdepyuic +# The SIP files are outside TDE's prefix +%{_datadir}/sip/trinity/ %files doc %defattr(-,root,root,-) -%{tde_docdir}/HTML/en/%{name} +%{tde_tdedocdir}/HTML/en/python-trinity/ %Changelog