RHEL/Fedora: some more updates for MGA2/MDV2011 building

pull/3/head
Francois Andriot 12 years ago
parent 75c1b2f8bf
commit c0c1a90179

@ -1,25 +1,31 @@
# Basic package informations # Basic package informations
%define kdecomp amarok %define kdecomp amarok
%define version 1.4.10
%define release 6
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_datadir}/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{kdecomp} %define _docdir %{tde_docdir}
Summary: Media player
Version: %{version}
Release: %{release}%{?dist}%{?_variant} Name: trinity-%{kdecomp}
Summary: Media player
Version: 1.4.10
Release: 6%{?dist}%{?_variant}
Group: Applications/Multimedia Group: Applications/Multimedia
License: GPLv2+ License: GPLv2+
@ -78,36 +84,42 @@ BuildRequires: postgresql-devel
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: taglib-devel BuildRequires: taglib-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: trinity-libkarma-devel karma-sharp %if 0%{?rhel} || 0%{?fedora}
BuildRequires: trinity-libkarma-devel
BuildRequires: trinity-karma-sharp
%else
BuildRequires: libkarma-devel
BuildRequires: karma-sharp
%endif
# not used anymore, in favor of libvisual ? -- Rex # not used anymore, in favor of libvisual ? -- Rex
#%{?fedora:BuildRequires: xmms-devel} #%{?fedora:BuildRequires: xmms-devel}
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel BuildRequires: dbus-tqt-devel
BuildRequires: trinity-akode-devel BuildRequires: trinity-akode-devel
BuildRequires: trinity-konqueror-devel
# ruby
BuildRequires: ruby
BuildRequires: ruby-devel
# To open the selected browser, works with Patch2 # To open the selected browser, works with Patch2
Requires: xdg-utils Requires: xdg-utils
Requires(post): xdg-utils Requires(post): xdg-utils
Requires(postun): xdg-utils Requires(postun): xdg-utils
%if "%{?_prefix}" == "%{_usr}" # xine-lib
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3 %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libxine-devel
Obsoletes: amarok-devel < %{version}-%{release} %else
%if 0%{?fedora} > 6 && 0%{?fedora} < 9 BuildRequires: xine-lib-devel
# need to keep this around for previous releases, so not to break multilib compat.
Provides: amarok-devel = %{version}-%{release}
%endif %endif
# engines, etc...
# old, obsolete ones: arts, akode
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
%endif
# xine-lib %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: xine-lib-devel BuildRequires: %{_lib}inotifytools-devel
%else
%endif
Provides: %{name}-engine-xine = %{version}-%{release}
%description %description
Amarok is a multimedia player with: Amarok is a multimedia player with:
@ -115,38 +127,140 @@ Amarok is a multimedia player with:
- plays all formats supported by the various engines - plays all formats supported by the various engines
- audio effects, like reverb and compressor - audio effects, like reverb and compressor
- compatible with the .m3u and .pls formats for playlists - compatible with the .m3u and .pls formats for playlists
- nice GUI, integrates into the KDE look, but with a unique touch - nice GUI, integrates into the TDE look, but with a unique touch
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{tde_bindir}/amarok
%{tde_bindir}/amarokapp
%{tde_bindir}/amarokcollectionscanner
%{tde_bindir}/amarok_proxy.rb
%{tde_datadir}/apps/amarok/
%{tde_datadir}/icons/hicolor/*/*/*
%{tde_datadir}/applications/kde/*.desktop
%{tde_datadir}/servicetypes/*.desktop
%{tde_datadir}/apps/profiles/amarok.profile.xml
%{tde_datadir}/config/amarokrc
%{tde_datadir}/config.kcfg/*.kcfg
%{tde_datadir}/services/amarokitpc.protocol
%{tde_datadir}/services/amaroklastfm.protocol
%{tde_datadir}/services/amarokpcast.protocol
# -libs ? -- Rex
%{tde_libdir}/libamarok.*
# DAAP
%{tde_bindir}/amarok_daapserver.rb
%{tde_tdelibdir}/libamarok_daap-mediadevice.*
%{tde_datadir}/services/amarok_daap-mediadevice.desktop
# Mass-storage
%{tde_datadir}/services/amarok_massstorage-device.desktop
%{tde_tdelibdir}/libamarok_massstorage-device.*
# NFS
%{tde_datadir}/services/amarok_nfs-device.desktop
%{tde_tdelibdir}/libamarok_nfs-device.*
# SMB
%{tde_datadir}/services/amarok_smb-device.desktop
%{tde_tdelibdir}/libamarok_smb-device.*
# IPod
%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
# VFAT
%{tde_datadir}/services/amarok_generic-mediadevice.desktop
%{tde_tdelibdir}/libamarok_generic-mediadevice.*
# iRiver
%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
# Creative Zen
%{tde_datadir}/services/amarok_njb-mediadevice.desktop
%{tde_tdelibdir}/libamarok_njb-mediadevice.*
# MTP players
%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
# Rio Karma
%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
# Void engine (noop)
%{tde_datadir}/services/amarok_void-engine_plugin.desktop
%{tde_tdelibdir}/libamarok_void-engine_plugin.*
# Xine engine
%{tde_datadir}/services/amarok_xine-engine.desktop
%{tde_tdelibdir}/libamarok_xine-engine.*
## Gstreamer engine
#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
# YAUAP
%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
# AKODE
%{tde_datadir}/services/amarok_aKode-engine.desktop
%{tde_tdelibdir}/libamarok_aKode-engine.*
%post
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
##########
%package ruby %package ruby
Summary: %{name} Ruby support Summary: %{name} Ruby support
Group: Applications/Multimedia Group: Applications/Multimedia
BuildRequires: ruby-devel ruby
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# For dir ownership and some default plugins (lyrics) # For dir ownership and some default plugins (lyrics)
Requires: ruby Requires: ruby
%description ruby %description ruby
%{summary}. %{summary}.
%files ruby
%defattr(-,root,root,-)
%{tde_libdir}/ruby_lib/*
##########
%package konqueror %package konqueror
Summary: Amarok konqueror (service menus, sidebar) support Summary: Amarok konqueror (service menus, sidebar) support
Group: Applications/Multimedia Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: trinity-konqueror
%description konqueror %description konqueror
%{summary}. %{summary}.
%files konqueror
%defattr(-,root,root,-)
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_tdelibdir}/konqsidebar_universalamarok.*
%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
##########
%package visualisation %package visualisation
Summary: Visualisation plugins for Amarok Summary: Visualisation plugins for Amarok
Group: Applications/Multimedia Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# No plugins by default, we need libvisual-plugins # No plugins by default, we need libvisual-plugins
#Requires: libvisual-plugins #Requires: libvisual-plugins
%description visualisation %description visualisation
Amarok can use visualisation plugins from different origins. Amarok can use visualisation plugins from different origins.
Right now, only xmms is supported, which means that you can Right now, only xmms is supported, which means that you can
use any of xmms' visualisation plugins with Amarok. use any of xmms' visualisation plugins with Amarok.
%files visualisation
%defattr(-,root,root,-)
%{tde_bindir}/amarok_libvisual
##########
%prep %prep
%setup -q -n applications/amarok %setup -q -n applications/amarok
@ -162,14 +276,24 @@ use any of xmms' visualisation plugins with Amarok.
%build %build
unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh unset QTDIR; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif
%cmake \ %cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DQT_LIBRARY_DIRS="${QTLIB}" \
-DWITH_LIBVISUAL=ON \ -DWITH_LIBVISUAL=ON \
-DWITH_KONQSIDEBAR=ON \ -DWITH_KONQSIDEBAR=ON \
-DWITH_XINE=ON \ -DWITH_XINE=ON \
@ -182,7 +306,6 @@ cd build
-DWITH_RIOKARMA=ON \ -DWITH_RIOKARMA=ON \
-DWITH_DAAP=ON \ -DWITH_DAAP=ON \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
-DQT_LIBRARY_DIRS="${QTLIB}" \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -191,129 +314,36 @@ cd build
%__rm -fr $RPM_BUILD_ROOT %__rm -fr $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT -C build %__make install DESTDIR=$RPM_BUILD_ROOT -C build
# desktop files
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
# unpackaged files # unpackaged files
%__rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
# HTML # HTML
for lang_dir in $RPM_BUILD_ROOT%{tde_docdir}/HTML/* ; do for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
if [ -d $lang_dir ]; then if [ -d $lang_dir ]; then
lang=$(basename $lang_dir) lang=$(basename $lang_dir)
[ "$lang" == "en" ] && d=en/amarok || d=$lang [ "$lang" == "en" ] && d=en/amarok || d=$lang
echo "%lang($lang) %doc %{tde_docdir}/HTML/$d" >> %{name}.lang echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
fi fi
done done
# Locales # Locales
for locale in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
if [ -r $locale/LC_MESSAGES/amarok.mo ]; then if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
lang=$(basename $locale) lang=$(basename $locale)
echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
fi fi
done done
%post
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%clean %clean
%__rm -fr $RPM_BUILD_ROOT %__rm -fr $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/amarok
%{_bindir}/amarokapp
%{_bindir}/amarokcollectionscanner
%{_bindir}/amarok_proxy.rb
%{_datadir}/apps/amarok/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/servicetypes/*.desktop
%{_datadir}/apps/profiles/amarok.profile.xml
%{_datadir}/config/amarokrc
%{_datadir}/config.kcfg/*.kcfg
%{_datadir}/services/amarokitpc.protocol
%{_datadir}/services/amaroklastfm.protocol
%{_datadir}/services/amarokpcast.protocol
# -libs ? -- Rex
%{_libdir}/libamarok.*
# DAAP
%{_bindir}/amarok_daapserver.rb
%{tde_libdir}/libamarok_daap-mediadevice.*
%{_datadir}/services/amarok_daap-mediadevice.desktop
# Mass-storage
%{_datadir}/services/amarok_massstorage-device.desktop
%{tde_libdir}/libamarok_massstorage-device.*
# NFS
%{_datadir}/services/amarok_nfs-device.desktop
%{tde_libdir}/libamarok_nfs-device.*
# SMB
%{_datadir}/services/amarok_smb-device.desktop
%{tde_libdir}/libamarok_smb-device.*
# IPod
%{_datadir}/services/amarok_ipod-mediadevice.desktop
%{tde_libdir}/libamarok_ipod-mediadevice.*
# VFAT
%{_datadir}/services/amarok_generic-mediadevice.desktop
%{tde_libdir}/libamarok_generic-mediadevice.*
# iRiver
%{_datadir}/services/amarok_ifp-mediadevice.desktop
%{tde_libdir}/libamarok_ifp-mediadevice.*
# Creative Zen
%{_datadir}/services/amarok_njb-mediadevice.desktop
%{tde_libdir}/libamarok_njb-mediadevice.*
# MTP players
%{_datadir}/services/amarok_mtp-mediadevice.desktop
%{tde_libdir}/libamarok_mtp-mediadevice.*
# Rio Karma
%{_datadir}/services/amarok_riokarma-mediadevice.desktop
%{tde_libdir}/libamarok_riokarma-mediadevice.*
# Void engine (noop)
%{_datadir}/services/amarok_void-engine_plugin.desktop
%{tde_libdir}/libamarok_void-engine_plugin.*
# Xine engine
%{_datadir}/services/amarok_xine-engine.desktop
%{tde_libdir}/libamarok_xine-engine.*
## Gstreamer engine
#%{_datadir}/services/amarok_gst10engine_plugin.desktop
#%{tde_libdir}/libamarok_gst10engine_plugin.*
# YAUAP
%{_datadir}/services/amarok_yauap-engine_plugin.desktop
%{tde_libdir}/libamarok_yauap-engine_plugin.*
# AKODE
%{_datadir}/services/amarok_aKode-engine.desktop
%{tde_libdir}/libamarok_aKode-engine.*
%files ruby
%defattr(-,root,root,-)
%{_libdir}/ruby_lib/*
%files konqueror
%defattr(-,root,root,-)
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_libdir}/konqsidebar_universalamarok.*
%{_datadir}/apps/konqsidebartng/*/amarok.desktop
%files visualisation
%defattr(-,root,root,-)
%{_bindir}/amarok_libvisual
%changelog %changelog

@ -1,25 +1,31 @@
# Default version for this component # Default version for this component
%define kdecomp basket %define kdecomp basket
%define version 1.0.3.1
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: Taking care of your ideas. Summary: Taking care of your ideas.
Version: %{?version} Version: 1.0.3.1
Release: %{?release}%{?dist}%{?_variant} Release: 2%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -42,7 +48,7 @@ BuildRequires: trinity-kdebase-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: trinity-kdepim-devel BuildRequires: trinity-tdepim-devel >= 3.5.13
%description %description
This application is mainly an all-purpose notes taker. It provide several baskets where This application is mainly an all-purpose notes taker. It provide several baskets where
@ -61,8 +67,8 @@ baskets to HTML.
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -70,10 +76,16 @@ baskets to HTML.
%build %build
export PATH="%{_bindir}:${PATH}" unset QTDIR; . /etc/profile.d/qt.sh
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt \ --with-extra-includes=%{_includedir}/tqt \
--disable-static --disable-static
@ -82,10 +94,11 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -93,37 +106,52 @@ export PATH="%{_bindir}:${PATH}"
%post %post
for f in crystalsvg ; do for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} || : touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done done
/sbin/ldconfig /sbin/ldconfig
%postun %postun
for f in crystalsvg ; do for f in crystalsvg ; do
touch --no-create %{_datadir}/icons/${f} || : touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done done
/sbin/ldconfig /sbin/ldconfig
%files %files -f %{kdecomp}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING %doc AUTHORS COPYING
%{_bindir}/* %{tde_bindir}/basket
%{_datadir}/applications/*/*.desktop %{tde_tdeappdir}/basket.desktop
%{_datadir}/apps/*/ %{tde_datadir}/apps/basket/
%{_datadir}/icons/crystalsvg/*/*/* %{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
%{_datadir}/locale/*/*/*.mo %{tde_libdir}/libbasketcommon.la
%{tde_docdir}/HTML/en/*/ %{tde_libdir}/libbasketcommon.so
%{_datadir}/services/*.desktop %{tde_tdelibdir}/basketthumbcreator.la
%{_datadir}/mimelnk/application/*.desktop %{tde_tdelibdir}/basketthumbcreator.so
%{_datadir}/services/*/*.desktop %{tde_tdelibdir}/kcm_basket.la
%{_datadir}/config/magic/*.magic %{tde_tdelibdir}/kcm_basket.so
%{_libdir}/*.so %{tde_tdelibdir}/libbasketpart.la
%{_libdir}/*.la %{tde_tdelibdir}/libbasketpart.so
%{tde_libdir}/*.so %{tde_tdelibdir}/libkontact_basket.la
%{tde_libdir}/*.la %{tde_tdelibdir}/libkontact_basket.so
%{tde_datadir}/config/magic/basket.magic
%{tde_datadir}/icons/crystalsvg/*/*/*
%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
%{tde_datadir}/mimelnk/application/x-basket-template.desktop
%{tde_datadir}/services/basket_config_apps.desktop
%{tde_datadir}/services/basket_config_baskets.desktop
%{tde_datadir}/services/basket_config_features.desktop
%{tde_datadir}/services/basket_config_general.desktop
%{tde_datadir}/services/basket_config_new_notes.desktop
%{tde_datadir}/services/basket_config_notes.desktop
%{tde_datadir}/services/basket_config_notes_appearance.desktop
%{tde_datadir}/services/basket_part.desktop
%{tde_datadir}/services/basketthumbcreator.desktop
%{tde_datadir}/services/kontact/basket.desktop
%{tde_datadir}/services/kontact/basket_v4.desktop
%{tde_tdedocdir}/HTML/en/basket/
%Changelog %Changelog

@ -0,0 +1,31 @@
--- bibletime/sword.m4.ftbfs 2011-05-17 20:42:02.000000000 +0200
+++ bibletime/sword.m4 2012-08-03 17:40:00.461746639 +0200
@@ -119,7 +119,7 @@
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_installed_sword_version=`./conftest 2>&5`
@@ -192,7 +192,7 @@
}
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
--- bibletime/clucene.m4.ORI 2012-08-03 17:41:19.989067063 +0200
+++ bibletime/clucene.m4 2012-08-03 17:41:35.675734952 +0200
@@ -119,7 +119,7 @@
EOF
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_installed_clucene_version=`./conftest 2>&5`

@ -1,25 +1,31 @@
# Default version for this component # Default version for this component
%define kdecomp bibletime %define kdecomp bibletime
%define version 1.6.6.0
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: A bible study tool for Trinity Summary: A bible study tool for Trinity
Version: %{?version} Version: 1.6.6.0
Release: %{?release}%{?dist}%{?_variant} Release: 2%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -37,6 +43,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz
Patch0: bibletime-3.5.13-clucene_detection.patch Patch0: bibletime-3.5.13-clucene_detection.patch
# [bibletime] Fix compilation with GCC 4.7 # [bibletime] Fix compilation with GCC 4.7
Patch1: bibletime-3.5.13-fix_gcc47_compilation.patch Patch1: bibletime-3.5.13-fix_gcc47_compilation.patch
# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
Patch2: bibletime-3.5.13-fix_sword_linking.patch
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
@ -44,11 +52,16 @@ BuildRequires: trinity-kdebase-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
%if 0%{?fedora} >= 16 %if 0%{?fedora} >= 16
BuildRequires: clucene09-core-devel BuildRequires: clucene09-core-devel
%else %else
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: clucene-devel
%else
BuildRequires: clucene-core-devel BuildRequires: clucene-core-devel
%endif %endif
%endif
BuildRequires: sword-devel BuildRequires: sword-devel
Requires: sword Requires: sword
@ -64,13 +77,14 @@ texts, write own notes, save, print etc.).
%prep %prep
%setup -q -n applications/%{kdecomp} %setup -q -n applications/%{kdecomp}
%patch0 -p0 %patch0 -p0
%patch1 -p1 %patch1 -p1 -b .gcc47
%patch2 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -78,12 +92,19 @@ texts, write own notes, save, print etc.).
%build %build
export PATH="%{_bindir}:${PATH}" unset QTDIR; . /etc/profile.d/qt.sh
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt
# Not SMP safe ! # Not SMP safe !
%__make -C bibletime/frontend %__make -C bibletime/frontend
@ -93,13 +114,13 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/pics/* %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/tips %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
@ -109,24 +130,24 @@ export PATH="%{_bindir}:${PATH}"
%post %post
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || : /sbin/ldconfig || :
%postun %postun
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig || : /sbin/ldconfig || :
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/bibletime %{tde_bindir}/bibletime
%{_includedir}/bibletimeinterface.h %{tde_tdeincludedir}/bibletimeinterface.h
%{_datadir}/applications/bibletime.desktop %{tde_datadir}/applications/bibletime.desktop
%{_datadir}/apps/bibletime %{tde_datadir}/apps/bibletime/
%{_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/icons/hicolor/*/*/*.png
%{tde_docdir}/HTML/en/bibletime/ %{tde_tdedocdir}/HTML/en/bibletime/
%Changelog %Changelog

@ -0,0 +1,19 @@
commit 029218cd9cd3192a2a61ac29d896a2c3640f2dd8
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1336066180 -0500
Fix 'format not a string literal' error
diff --git a/digikam/libs/sqlite2/shell.c b/digikam/libs/sqlite2/shell.c
index 1100f38..89898ab 100644
--- a/digikam/libs/sqlite2/shell.c
+++ b/digikam/libs/sqlite2/shell.c
@@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
}else
if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
- fprintf(stderr,zHelp);
+ fprintf(stderr, "%s", zHelp);
}else
if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){

@ -1,6 +1,14 @@
--- /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h 2011-05-19 22:00:43.000000000 -0500 commit b9419cd5ed26f4ed70b882243cc4bd8a6f19797e
+++ /dev/shm/applications/digikam/digikam/libs/jpegutils/jpegint.h.new 2011-11-05 23:20:17.144180063 -0500 Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -42,9 +42,9 @@ Date: 1326324936 -0600
Fix digikam FTBFS due to jpeg code
diff --git a/digikam/libs/jpegutils/jpegint.h b/digikam/libs/jpegutils/jpegint.h
index 1fa82f8..27546f3 100644
--- a/digikam/libs/jpegutils/jpegint.h
+++ b/digikam/libs/jpegutils/jpegint.h
@@ -42,9 +42,9 @@ typedef enum { /* Operating modes for buffer controllers */
/* Master control module */ /* Master control module */
struct jpeg_comp_master { struct jpeg_comp_master {
@ -13,7 +21,7 @@
/* State variables made visible to other modules */ /* State variables made visible to other modules */
boolean call_pass_startup; /* True if pass_startup must be called */ boolean call_pass_startup; /* True if pass_startup must be called */
@@ -53,16 +53,16 @@ @@ -53,16 +53,16 @@ struct jpeg_comp_master {
/* Main buffer control (downsampled-data buffer) */ /* Main buffer control (downsampled-data buffer) */
struct jpeg_c_main_controller { struct jpeg_c_main_controller {
@ -34,7 +42,7 @@
JSAMPARRAY input_buf, JSAMPARRAY input_buf,
JDIMENSION *in_row_ctr, JDIMENSION *in_row_ctr,
JDIMENSION in_rows_avail, JDIMENSION in_rows_avail,
@@ -73,23 +73,23 @@ @@ -73,23 +73,23 @@ struct jpeg_c_prep_controller {
/* Coefficient buffer control */ /* Coefficient buffer control */
struct jpeg_c_coef_controller { struct jpeg_c_coef_controller {
@ -64,7 +72,7 @@
JSAMPIMAGE input_buf, JDIMENSION in_row_index, JSAMPIMAGE input_buf, JDIMENSION in_row_index,
JSAMPIMAGE output_buf, JSAMPIMAGE output_buf,
JDIMENSION out_row_group_index)); JDIMENSION out_row_group_index));
@@ -99,9 +99,9 @@ @@ -99,9 +99,9 @@ struct jpeg_downsampler {
/* Forward DCT (also controls coefficient quantization) */ /* Forward DCT (also controls coefficient quantization) */
struct jpeg_forward_dct { struct jpeg_forward_dct {
@ -76,7 +84,7 @@
jpeg_component_info * compptr, jpeg_component_info * compptr,
JSAMPARRAY sample_data, JBLOCKROW coef_blocks, JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
JDIMENSION start_row, JDIMENSION start_col, JDIMENSION start_row, JDIMENSION start_col,
@@ -110,23 +110,23 @@ @@ -110,23 +110,23 @@ struct jpeg_forward_dct {
/* Entropy encoding */ /* Entropy encoding */
struct jpeg_entropy_encoder { struct jpeg_entropy_encoder {
@ -110,7 +118,7 @@
}; };
@@ -134,8 +134,8 @@ @@ -134,8 +134,8 @@ struct jpeg_marker_writer {
/* Master control module */ /* Master control module */
struct jpeg_decomp_master { struct jpeg_decomp_master {
@ -121,7 +129,7 @@
/* State variables made visible to other modules */ /* State variables made visible to other modules */
boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */ boolean is_dummy_pass; /* True during 1st pass for 2-pass quant */
@@ -143,10 +143,10 @@ @@ -143,10 +143,10 @@ struct jpeg_decomp_master {
/* Input control module */ /* Input control module */
struct jpeg_input_controller { struct jpeg_input_controller {
@ -136,7 +144,7 @@
/* State variables made visible to other modules */ /* State variables made visible to other modules */
boolean has_multiple_scans; /* True if file has multiple scans */ boolean has_multiple_scans; /* True if file has multiple scans */
@@ -155,18 +155,18 @@ @@ -155,18 +155,18 @@ struct jpeg_input_controller {
/* Main buffer control (downsampled-data buffer) */ /* Main buffer control (downsampled-data buffer) */
struct jpeg_d_main_controller { struct jpeg_d_main_controller {
@ -161,7 +169,7 @@
JSAMPIMAGE output_buf)); JSAMPIMAGE output_buf));
/* Pointer to array of coefficient virtual arrays, or NULL if none */ /* Pointer to array of coefficient virtual arrays, or NULL if none */
jvirt_barray_ptr *coef_arrays; jvirt_barray_ptr *coef_arrays;
@@ -174,8 +174,8 @@ @@ -174,8 +174,8 @@ struct jpeg_d_coef_controller {
/* Decompression postprocessing (color quantization buffer control) */ /* Decompression postprocessing (color quantization buffer control) */
struct jpeg_d_post_controller { struct jpeg_d_post_controller {
@ -172,7 +180,7 @@
JSAMPIMAGE input_buf, JSAMPIMAGE input_buf,
JDIMENSION *in_row_group_ctr, JDIMENSION *in_row_group_ctr,
JDIMENSION in_row_groups_avail, JDIMENSION in_row_groups_avail,
@@ -186,12 +186,12 @@ @@ -186,12 +186,12 @@ struct jpeg_d_post_controller {
/* Marker reading & parsing */ /* Marker reading & parsing */
struct jpeg_marker_reader { struct jpeg_marker_reader {
@ -187,7 +195,7 @@
/* Read a restart marker --- exported for use by entropy decoder only */ /* Read a restart marker --- exported for use by entropy decoder only */
jpeg_marker_parser_method read_restart_marker; jpeg_marker_parser_method read_restart_marker;
@@ -206,8 +206,8 @@ @@ -206,8 +206,8 @@ struct jpeg_marker_reader {
/* Entropy decoding */ /* Entropy decoding */
struct jpeg_entropy_decoder { struct jpeg_entropy_decoder {
@ -198,7 +206,7 @@
JBLOCKROW *MCU_data)); JBLOCKROW *MCU_data));
/* This is here to share code between baseline and progressive decoders; */ /* This is here to share code between baseline and progressive decoders; */
@@ -216,21 +216,21 @@ @@ -216,21 +216,21 @@ struct jpeg_entropy_decoder {
}; };
/* Inverse DCT (also performs dequantization) */ /* Inverse DCT (also performs dequantization) */
@ -224,7 +232,7 @@
JSAMPIMAGE input_buf, JSAMPIMAGE input_buf,
JDIMENSION *in_row_group_ctr, JDIMENSION *in_row_group_ctr,
JDIMENSION in_row_groups_avail, JDIMENSION in_row_groups_avail,
@@ -243,20 +243,20 @@ @@ -243,20 +243,20 @@ struct jpeg_upsampler {
/* Colorspace conversion */ /* Colorspace conversion */
struct jpeg_color_deconverter { struct jpeg_color_deconverter {

@ -0,0 +1,30 @@
commit 18ecd51264727c75ab3e17a762d8f95361023f0a
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1340749881 -0500
Fix FTBFS on png >= 0.15
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
index 6dba518..97acf12 100644
--- a/digikam/kioslave/digikamthumbnail.cpp
+++ b/digikam/kioslave/digikamthumbnail.cpp
@@ -413,16 +413,16 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand(png_ptr);
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
has_alpha = 1;
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
has_alpha = 1;
has_grey = 1;
}
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+ if (color_type == PNG_COLOR_TYPE_GRAY)
has_grey = 1;
unsigned char **lines;

@ -1,7 +1,15 @@
diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp commit 3e27b07ff572b00aa5f013f039c3f63593016816
--- digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp 2009-07-03 07:19:41.000000000 +0200 Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+++ digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp 2010-06-30 10:29:09.000000000 +0200 Date: 1326324999 -0600
@@ -370,7 +370,7 @@
Fix FTBFS due to png code
This closes Bug 595
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
index 33ba573..96cba8e 100644
--- a/digikam/kioslave/digikamthumbnail.cpp
+++ b/digikam/kioslave/digikamthumbnail.cpp
@@ -370,7 +370,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
unsigned char buf[PNG_BYTES_TO_CHECK]; unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f); fread(buf, 1, PNG_BYTES_TO_CHECK, f);
@ -10,7 +18,7 @@ diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/
{ {
fclose(f); fclose(f);
return qimage; return qimage;
@@ -465,7 +465,7 @@ @@ -465,7 +465,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
{ {
png_set_gray_to_rgb(png_ptr); png_set_gray_to_rgb(png_ptr);
if (png_get_bit_depth(png_ptr, info_ptr) < 8) if (png_get_bit_depth(png_ptr, info_ptr) < 8)
@ -19,10 +27,11 @@ diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/
} }
int sizeOfUint = sizeof(unsigned int); int sizeOfUint = sizeof(unsigned int);
diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
--- digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp 2009-07-03 07:19:41.000000000 +0200 index ac1fcf8..3367561 100644
+++ digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp 2010-06-30 10:28:24.000000000 +0200 --- a/digikam/libs/dimg/loaders/pngloader.cpp
@@ -88,7 +88,7 @@ +++ b/digikam/libs/dimg/loaders/pngloader.cpp
@@ -88,7 +88,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
unsigned char buf[PNG_BYTES_TO_CHECK]; unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f); fread(buf, 1, PNG_BYTES_TO_CHECK, f);
@ -31,7 +40,7 @@ diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.
{ {
DDebug() << k_funcinfo << "Not a PNG image file." << endl; DDebug() << k_funcinfo << "Not a PNG image file." << endl;
fclose(f); fclose(f);
@@ -252,7 +252,7 @@ @@ -252,7 +252,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
#ifdef ENABLE_DEBUG_MESSAGES #ifdef ENABLE_DEBUG_MESSAGES
DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
#endif #endif
@ -40,10 +49,11 @@ diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.
png_set_gray_to_rgb(png_ptr); png_set_gray_to_rgb(png_ptr);
if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel
diff -ruN digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h digikam-0.9.6/digikam/libs/greycstoration/CImg.h diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h
--- digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h 2009-07-03 07:19:41.000000000 +0200 index e240f99..714920e 100644
+++ digikam-0.9.6/digikam/libs/greycstoration/CImg.h 2010-06-30 10:28:52.000000000 +0200 --- a/digikam/libs/greycstoration/CImg.h
@@ -29449,7 +29449,7 @@ +++ b/digikam/libs/greycstoration/CImg.h
@@ -29449,7 +29449,7 @@ namespace cimg_library {
new_bit_depth = 8; new_bit_depth = 8;
} }
if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){ if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){

@ -1,24 +0,0 @@
--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.libpng 2012-05-01 15:02:57.235666444 +0200
+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 15:04:30.737122439 +0200
@@ -408,10 +408,11 @@
TQMap<int, TQByteArray>& metaData = imageMetaData();
png_charp profile_name, profile_data=NULL;
+ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
png_uint_32 profile_size;
int compression_type;
- png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_size);
+ png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &profile_size);
if (profile_data != NULL)
{
@@ -607,7 +608,7 @@
if (!profile_rawdata.isEmpty())
{
- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (unsigned char*)profile_rawdata.data(), profile_rawdata.size());
}
// -------------------------------------------------------------------

@ -1,40 +0,0 @@
--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2012-05-01 14:49:41.357985513 +0200
+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 14:53:47.459349483 +0200
@@ -120,7 +120,11 @@
// PNG error handling. If an error occurs during reading, libpng
// will jump here
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -526,7 +531,11 @@
// PNG error handling. If an error occurs during writing, libpng
// will jump here
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
fclose(f);
--- digikam/digikam/kioslave/digikamthumbnail.cpp.ORI 2012-05-01 15:44:40.237089691 +0200
+++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-05-01 15:45:22.939534916 +0200
@@ -392,7 +392,11 @@
return qimage;
}
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(f);

@ -0,0 +1,41 @@
commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1334801652 -0500
Fix usage of obsolete libpng jmpbuf member
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
index 96cba8e..6dba518 100644
--- a/digikam/kioslave/digikamthumbnail.cpp
+++ b/digikam/kioslave/digikamthumbnail.cpp
@@ -392,7 +392,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
return qimage;
}
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(f);
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
index 3367561..fd5d771 100644
--- a/digikam/libs/dimg/loaders/pngloader.cpp
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
@@ -120,7 +120,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
// PNG error handling. If an error occurs during reading, libpng
// will jump here
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -526,7 +526,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
// PNG error handling. If an error occurs during writing, libpng
// will jump here
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
fclose(f);

@ -0,0 +1,20 @@
commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1336340005 -0500
Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>.
Thanks to /dev/ammo42.
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
index fa6dad9..6862b6e 100644
--- a/digikam/libs/dimg/loaders/pngloader.cpp
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
@@ -611,7 +611,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
if (!profile_rawdata.isEmpty())
{
#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
- png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, reinterpret_cast<iCCP_data>(profile_rawdata.data()), profile_rawdata.size());
#else
png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
#endif

@ -0,0 +1,50 @@
commit a94890345ef2caae35a72ed3a398b2984349bb2f
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1335586728 -0500
GCC 4.7 fix.
This partially resolves bug report 958.
Thanks to David C. Rankin.
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
index fd5d771..fa6dad9 100644
--- a/digikam/libs/dimg/loaders/pngloader.cpp
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
@@ -57,6 +57,12 @@ extern "C"
namespace Digikam
{
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
+ typedef png_bytep iCCP_data;
+#else
+ typedef png_charp iCCP_data;
+#endif
+
PNGLoader::PNGLoader(DImg* image)
: DImgLoader(image)
{
@@ -403,7 +409,12 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
TQMap<int, TQByteArray>& metaData = imageMetaData();
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
+ png_charp profile_name;
+ iCCP_data profile_data=NULL;
+#else
png_charp profile_name, profile_data=NULL;
+#endif
png_uint_32 profile_size;
int compression_type;
@@ -599,7 +610,11 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
if (!profile_rawdata.isEmpty())
{
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
+#else
png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
+#endif
}
// -------------------------------------------------------------------

@ -0,0 +1,33 @@
commit a209c81b78b8af98c53748bc1eb9020ef6b2605e
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1335586778 -0500
GCC 4.7 fix.
This partially resolves bug report 958.
Thanks to David C. Rankin.
diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
index d6b9f74..07f43bb 100644
--- a/digikam/digikam/albummanager.cpp
+++ b/digikam/digikam/albummanager.cpp
@@ -1579,16 +1579,16 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data)
// Check if Year Album already exist.
DAlbum *yAlbum = 0;
- AlbumIterator it(d->rootDAlbum);
- while (it.current())
+ AlbumIterator it2(d->rootDAlbum);
+ while (it2.current())
{
- DAlbum* a = (DAlbum*)(*it);
+ DAlbum* a = (DAlbum*)(*it2);
if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
{
yAlbum = a;
break;
}
- ++it;
+ ++it2;
}
// If no, create Year album.

@ -1,47 +0,0 @@
diff -uNrb digikam.orig/digikam/digikam/albummanager.cpp digikam/digikam/digikam/albummanager.cpp
--- digikam.orig/digikam/digikam/albummanager.cpp 2012-02-21 18:52:03.000000000 -0600
+++ digikam/digikam/digikam/albummanager.cpp 2012-04-19 16:42:29.951033101 -0500
@@ -1579,16 +1579,16 @@
// Check if Year Album already exist.
DAlbum *yAlbum = 0;
- AlbumIterator it(d->rootDAlbum);
- while (it.current())
+ AlbumIterator it2(d->rootDAlbum);
+ while (it2.current())
{
- DAlbum* a = (DAlbum*)(*it);
+ DAlbum* a = (DAlbum*)(*it2);
if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
{
yAlbum = a;
break;
}
- ++it;
+ ++it2;
}
// If no, create Year album.
diff -uNrb digikam.orig/digikam/kioslave/digikamthumbnail.cpp digikam/digikam/kioslave/digikamthumbnail.cpp
--- digikam.orig/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 07:02:43.000000000 -0500
+++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 16:44:10.307517462 -0500
@@ -413,16 +413,16 @@
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_expand(png_ptr);
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
has_alpha = 1;
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
has_alpha = 1;
has_grey = 1;
}
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+ if (color_type == PNG_COLOR_TYPE_GRAY)
has_grey = 1;
unsigned char **lines;

@ -0,0 +1,11 @@
--- digikam/digikam/digikam/Makefile.am.ORI 2012-08-03 19:41:42.791088483 +0200
+++ digikam/digikam/digikam/Makefile.am 2012-08-03 19:41:56.661794764 +0200
@@ -111,6 +111,8 @@
# if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null.
libdigikam_la_LIBADD = $(LIB_SQLITE3) \
$(LIB_SQLITE3_LOCAL) \
+ $(LIB_QT) \
+ $(LIB_KPARTS) \
$(LIB_KIO) \
$(LIB_KABC) \
$(LIB_KHTML) \

@ -0,0 +1,43 @@
commit 0f64ac7c10fb4053f578ef950e55510818d6d440
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1334285499 -0500
Remove version.h. Cruft from an older version prior to 0.9.6.
Part of an extensive cleanup of various problems with kipi-plugins, digikam,
and gwenview to resolve bug reports 241, 962, 963.
diff --git a/digikam/digikam/version.h b/digikam/digikam/version.h
deleted file mode 100644
index d9baae1..0000000
--- a/digikam/digikam/version.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ============================================================
- *
- * This file is a part of digiKam project
- * http://www.digikam.org
- *
- * Date : 2004-09-09
- * Description : digiKam release ID header.
- *
- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation;
- * either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * ============================================================ */
-
-#ifndef DIGIKAM_VERSION_H
-#define DIGIKAM_VERSION_H
-
-static const char digikam_version[] = "0.9.4";
-
-#endif // DIGIKAM_VERSION_H

@ -2,24 +2,30 @@
%define kdecomp digikam %define kdecomp digikam
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_datadir}/doc
%define _mandir %{_datadir}/man
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_appdir %{_datadir}/applications/kde %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{_docdir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_includedir}/kde %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{_libdir}/trinity %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: digital photo management application for KDE [Trinity] Summary: digital photo management application for KDE [Trinity]
Version: 0.9.6 Version: 0.9.6
Release: 2%{?dist}%{?_variant} Release: 3%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -33,16 +39,29 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
# TDE 3.5.13 on RHEL/Fedora specific patches # [digikam] Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
Patch1: digikam-3.5.13-jpegint-ftbfs.patch Patch1: digikam-3.5.13-fix_ftbfs_jpeg_code.patch
# [digikam] Add support for libpng 1.4 [Bug #595] # [digikam] Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
Patch2: digikam-3.5.13-fix_libpng_1.4.patch Patch2: digikam-3.5.13-fix_ftbfs_png_code.patch
# [digikam] gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] # [digikam] Remove version.h. Cruft from an older version prior to 0.9.6.
Patch3: digikam-3.5.13-libpng15+gcc47_1.patch # Part of an extensive cleanup of various problems with kipi-plugins, digikam,
# [digikam] Fix libpng support (again !!!) # and gwenview to resolve bug reports 241, 962, 963.
Patch4: digikam-3.5.13-fix_libpng_support.patch Patch3: digikam-3.5.13-remove_version_h.patch
# [digikam] Fix compilation with GCC 4.7 # [digikam] Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
Patch5: digikam-3.5.13-fix_gcc47_compilation.patch Patch4: digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch
# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a9489034]
Patch5: digikam-3.5.13-gcc_47_fix.patch
# [digikam] GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
Patch6: digikam-3.5.13-gcc_47_fix2.patch
# [digikam] Fix 'format not a string literal' error [Commit #029218cd]
Patch7: digikam-3.5.13-fix_fomat_not_string_literal.patch
# [digikam] Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
Patch8: digikam-3.5.13-fix_reinterpret_cast.patch
# [digikam] Fix FTBFS on png >= 0.15 [Commit #18ecd512]
Patch9: digikam-3.5.13-fix_ftbfs_png_015.patch
# [digikam] Missing LDFLAGS cause FTBFS on Mageia 2 / Mandriva 2011
Patch10: digikam-3.5.13-missing_ldflags.patch
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel
@ -53,15 +72,19 @@ BuildRequires: gettext
BuildRequires: trinity-libkexiv2-devel BuildRequires: trinity-libkexiv2-devel
BuildRequires: trinity-libkdcraw-devel BuildRequires: trinity-libkdcraw-devel
BuildRequires: trinity-libkipi-devel BuildRequires: trinity-libkipi-devel
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: gphoto2-devel BuildRequires: gphoto2-devel
%else %else
BuildRequires: libgphoto2-devel BuildRequires: libgphoto2-devel
%endif %endif
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: jasper-devel BuildRequires: jasper-devel
BuildRequires: exiv2-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}exiv2-devel
%else
BuildRequires: exiv2-devel
%endif
%description %description
An easy to use and powerful digital photo management An easy to use and powerful digital photo management
@ -95,19 +118,23 @@ Requires: %{name} = %{version}
%prep %prep
%setup -q -n applications/%{kdecomp} %setup -q -n applications/%{kdecomp}
%patch1 -p5 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1 -E
%patch4 -p1 -b .libpng %patch4 -p1
%if 0%{?fedora} >= 17
%patch5 -p1 -b .gcc47 %patch5 -p1 -b .gcc47
%endif %patch6 -p1 -b .gcc47
%patch7 -p1 -b .ftbfs
%patch8 -p1
%patch9 -p1 -b .png015
%patch10 -p1 -b .ftbfs
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__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/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -116,37 +143,48 @@ Requires: %{name} = %{version}
%build %build
unset QTDIR || : ; source /etc/profile.d/qt.sh unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_tdeincludedir}"
%configure \ %configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--mandir=%{tde_mandir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt \ --with-extra-includes=%{tde_tdeincludedir}/tqt \
--enable-closure --enable-closure
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%post %post
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig /sbin/ldconfig
update-desktop-database %{tde_appdir} 2> /dev/null || :
%postun %postun
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig /sbin/ldconfig
update-desktop-database %{tde_appdir} 2> /dev/null || :
%post devel %post devel
/sbin/ldconfig /sbin/ldconfig
@ -155,32 +193,92 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
/sbin/ldconfig /sbin/ldconfig
%files %files -f %{kdecomp}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING %doc AUTHORS COPYING
%{_bindir}/* %{tde_bindir}/digikam
%{_libdir}/*.so.* %{tde_bindir}/digikamthemedesigner
%{tde_appdir}/*.desktop %{tde_bindir}/digitaglinktree
%{_datadir}/locale/*/LC_MESSAGES/digikam.mo %{tde_bindir}/showfoto
%{_datadir}/services/*.desktop %{tde_libdir}/libdigikam.so.0
%{_datadir}/services/*.protocol %{tde_libdir}/libdigikam.so.0.0.0
%{_datadir}/servicetypes/digikamimageplugin.desktop %{tde_tdelibdir}/kio_digikamalbums.la
%{_datadir}/apps/*/ %{tde_tdelibdir}/kio_digikamalbums.so
%{tde_docdir}/HTML/en/*/ %{tde_tdelibdir}/kio_digikamdates.la
%{_datadir}/icons/hicolor/*/*/* %{tde_tdelibdir}/kio_digikamdates.so
%{_mandir}/man*/* %{tde_tdelibdir}/kio_digikamsearch.la
%{tde_libdir}/*.so %{tde_tdelibdir}/kio_digikamsearch.so
%{tde_libdir}/*.la %{tde_tdelibdir}/kio_digikamtags.la
%{tde_tdelibdir}/kio_digikamtags.so
%{tde_tdelibdir}/kio_digikamthumbnail.la
%{tde_tdelibdir}/kio_digikamthumbnail.so
%{tde_tdeappdir}/digikam.desktop
%{tde_tdeappdir}/showfoto.desktop
%{tde_datadir}/apps/digikam/
%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop
%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
%{tde_datadir}/apps/showfoto/
%{tde_datadir}/icons/hicolor/*/apps/digikam.png
%{tde_datadir}/icons/hicolor/*/apps/showfoto.png
%{tde_datadir}/services/digikamalbums.protocol
%{tde_datadir}/services/digikamdates.protocol
%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop
%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop
%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop
%{tde_datadir}/services/digikamimageplugin_blurfx.desktop
%{tde_datadir}/services/digikamimageplugin_border.desktop
%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop
%{tde_datadir}/services/digikamimageplugin_charcoal.desktop
%{tde_datadir}/services/digikamimageplugin_colorfx.desktop
%{tde_datadir}/services/digikamimageplugin_core.desktop
%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop
%{tde_datadir}/services/digikamimageplugin_emboss.desktop
%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop
%{tde_datadir}/services/digikamimageplugin_freerotation.desktop
%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop
%{tde_datadir}/services/digikamimageplugin_infrared.desktop
%{tde_datadir}/services/digikamimageplugin_inpainting.desktop
%{tde_datadir}/services/digikamimageplugin_inserttext.desktop
%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop
%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop
%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop
%{tde_datadir}/services/digikamimageplugin_perspective.desktop
%{tde_datadir}/services/digikamimageplugin_raindrop.desktop
%{tde_datadir}/services/digikamimageplugin_restoration.desktop
%{tde_datadir}/services/digikamimageplugin_sheartool.desktop
%{tde_datadir}/services/digikamimageplugin_superimpose.desktop
%{tde_datadir}/services/digikamimageplugin_texture.desktop
%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop
%{tde_datadir}/services/digikamsearch.protocol
%{tde_datadir}/services/digikamtags.protocol
%{tde_datadir}/services/digikamthumbnail.protocol
%{tde_datadir}/servicetypes/digikamimageplugin.desktop
%{tde_mandir}/man*/*
%{tde_tdedocdir}/HTML/en/digikam-apidocs/
%files devel %files devel
%{_includedir}/*.h %{tde_tdeincludedir}/digikam_export.h
%{_includedir}/digikam/ %{tde_tdeincludedir}/digikam/
%{_libdir}/*.so %{tde_libdir}/libdigikam.so
%{_libdir}/*.la %{tde_libdir}/libdigikam.la
%Changelog %Changelog
* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
- Add support for Mageia 2 and Mandriva 2011
- Removes old patches, adds GIT patches.
- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5]
- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f]
- Remove version.h. Cruft from an older version prior to 0.9.6.
- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7]
- GCC 4.7 fix. [Bug #958] [Commit #a9489034]
- GCC 4.7 fix. [Bug #958] [Commit #a209c81b]
- Fix 'format not a string literal' error [Commit #029218cd]
- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853]
- Fix FTBFS on png >= 0.15 [Commit #18ecd512]
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3 * Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
- Fix man directory location - Fix man directory location
- Fix postinstall - Fix postinstall

@ -2,7 +2,7 @@
%define kdecomp kaffeine %define kdecomp kaffeine
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%endif %endif

@ -68,6 +68,9 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
cd build cd build
%endif %endif
# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
# another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
# Otherwise, it defaults to ${QTDIR}/lib !
%cmake \ %cmake \
-DQT_PREFIX_DIR=${QTDIR} \ -DQT_PREFIX_DIR=${QTDIR} \
-DQT_VERSION=3 \ -DQT_VERSION=3 \
@ -76,6 +79,7 @@ cd build
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DBIN_INSTALL_DIR=%{tde_bindir} \ -DBIN_INSTALL_DIR=%{tde_bindir} \
-DQT_LIBRARY_DIR=${QTLIB} \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -22,7 +22,7 @@
Summary: Rio Karma tools Summary: Rio Karma tools
Name: trinity-libkarma Name: trinity-libkarma
Version: 0.1.2 Version: 0.1.2
Release: 2%{?dist} Release: 2%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: System/Libraries Group: System/Libraries
Url: http://www.freakysoft.de/html/libkarma/ Url: http://www.freakysoft.de/html/libkarma/
@ -45,6 +45,8 @@ BuildRequires: zlib-devel
Obsoletes: trinity-libkarma-libs < %{version}-%{release} Obsoletes: trinity-libkarma-libs < %{version}-%{release}
Provides: trinity-libkarma-libs = %{version}-%{release} Provides: trinity-libkarma-libs = %{version}-%{release}
Provides: libkarma = %{version}-%{release}
%description %description
Rio Karma access library Rio Karma access library
@ -53,6 +55,7 @@ Rio Karma access library
Summary: Rio Karma development files Summary: Rio Karma development files
Group: Development/C Group: Development/C
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: libkarma-devel = %{version}-%{release}
%description devel %description devel
Rio Karma development files Rio Karma development files

@ -1,14 +1,15 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
%define tde_datadir %{_prefix}/share %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdedocdir %{tde_docdir}/kde %define tde_tdedocdir %{tde_docdir}/kde
@ -27,7 +28,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
Prefix: %{_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. # GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
@ -632,7 +633,8 @@ done
%build %build
export PATH="%{_bindir}:${PATH}" unset QTDIR; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export kde_htmldir="%{tde_tdedocdir}/HTML" export kde_htmldir="%{tde_tdedocdir}/HTML"
@ -641,7 +643,7 @@ for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do for f in kde-i18n-${l}-*/; do
if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then if [ -d "${f}" ] && [ -x "${f}/configure" ] ; then
pushd ${f} pushd ${f}
%configure --datadir=%{tde_datadir} --docdir=%{tde_docdir} %configure --prefix=%{tde_prefix} --datadir=%{tde_datadir} --docdir=%{tde_docdir}
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
popd popd
fi fi
@ -650,7 +652,7 @@ done
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
for l in %{KDE_LANGS}; do for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*/; do for f in kde-i18n-${l}-*/; do
@ -661,7 +663,7 @@ for l in %{KDE_LANGS}; do
done done
# make symlinks relative # make symlinks relative
%if "%{_prefix}" == "/usr" %if "%{tde_prefix}" == "/usr"
pushd "%{buildroot}%{tde_tdedocdir}/HTML" pushd "%{buildroot}%{tde_tdedocdir}/HTML"
for lang in *; do for lang in *; do
if [ -d "$lang" ]; then if [ -d "$lang" ]; then
@ -700,7 +702,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png %__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png
# Removes conflict with KDE4 # Removes conflict with KDE4
%if "%{?_prefix}" == "/usr" %if "%{?tde_prefix}" == "/usr"
%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop %__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop
%endif %endif

@ -5,7 +5,7 @@
libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1 libKTTSD_Lib_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 0:1
lib_LTLIBRARIES = libKTTSD_Lib.la lib_LTLIBRARIES = libKTTSD_Lib.la
-libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE)
+libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) -lqt-mt -lDCOP +libKTTSD_Lib_la_LIBADD = $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP
noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h noinst_HEADERS = kttsdlib.h kttsdlibsetupimpl.h kttsdlibtalker2.h kdeexportfix.h
kspeech_DIR = $(KTTS_KSPEECH_DIR) kspeech_DIR = $(KTTS_KSPEECH_DIR)
@ -16,7 +16,7 @@
libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined libkttsd_la_LDFLAGS = -version-info 1:0:0 $(all_libraries) -no-undefined
-libkttsd_la_LIBADD = $(LIB_KIO) -libkttsd_la_LIBADD = $(LIB_KIO)
+libkttsd_la_LIBADD = $(LIB_KIO) -lqt-mt -lkdeui -lkdecore +libkttsd_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE)
# Header files that should not be installed. # Header files that should not be installed.
noinst_HEADERS = \ noinst_HEADERS = \

@ -460,6 +460,7 @@ export KDEDIRS=%{tde_prefix}
export KDEDIR=%{tde_prefix} export KDEDIR=%{tde_prefix}
%configure \ %configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \ --bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \

@ -5,7 +5,7 @@
# the libraries to link against. # the libraries to link against.
-libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB)
+libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -lqt-mt -lkdeui -lkdecore -lDCOP -lkio -lkparts -lkdefx +libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -lkdefx
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
@ -16,7 +16,7 @@
libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR) libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
-libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
+libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) -lkdecore -lkparts -lkdeui -lkutils -lDCOP -lkdefx -lkdeprint +libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_KDEPRINT) -lDCOP -lkdefx
KDE_OPTIONS = qtonly nofinal KDE_OPTIONS = qtonly nofinal
--- kdebindings/xparts/src/kde/Makefile.am.ORI 2012-07-30 14:27:24.347613550 +0200 --- kdebindings/xparts/src/kde/Makefile.am.ORI 2012-07-30 14:27:24.347613550 +0200
@ -26,7 +26,7 @@
libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \ libkdexparts_la_SOURCES = xparthost_kpart.cpp xparthost.skel xpart.stub \
kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub kbrowsersignals.cpp xbrowsersignals.skel xbrowserextension.stub
-libkdexparts_la_LIBADD = $(LIB_KPARTS) -libkdexparts_la_LIBADD = $(LIB_KPARTS)
+libkdexparts_la_LIBADD = $(LIB_KPARTS) -lDCOP -lqt-mt -lkdecore -lkdeui +libkdexparts_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0 libkdexparts_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0
xpart_DIR=$(srcdir)/../interfaces xpart_DIR=$(srcdir)/../interfaces

@ -38,7 +38,7 @@
libkolf_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 libkolf_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde
+libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde -lkdefx -lsoundserver_idl -lartsmodules +libkolf_la_LIBADD = $(LIB_KDEGAMES) $(LIB_KDEPRINT) $(LIB_KIO) -lartskde $(LIB_ARTS) -lkdefx -lartsmodules
libkolf_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP) libkolf_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP)

@ -5,7 +5,7 @@
compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
+libartsbuilder_la_LIBADD = -lmcop -lartsflow -lartsflow_idl $(LIBDL) +libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
libartsbuilder_la_COMPILE_FIRST = artsbuilder.h libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \ libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-no-undefined -no-undefined
@ -16,7 +16,7 @@
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \ -libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
+libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui -lkdefx -lqt-mt \ +libartsgui_kde_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lkdefx \
$(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
@ -38,7 +38,7 @@
$(top_builddir)/arts/midi/libartsmidi_idl.la \ $(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \ $(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) - -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile -lgthread-2.0 + -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
@ -49,7 +49,7 @@
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS) juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -lakode +juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs)
KDE_CXXFLAGS = $(USE_EXCEPTIONS) KDE_CXXFLAGS = $(USE_EXCEPTIONS)
@ -60,7 +60,7 @@
libkmidlib_la_LDFLAGS = $(all_libraries) libkmidlib_la_LDFLAGS = $(all_libraries)
-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid -libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid -lqt-mt -lkdeui -lDCOP -lkdecore +libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE)
libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkmidpart_la_LIBADD = libkmidlib.la libkmidpart_la_LIBADD = libkmidlib.la
@ -71,14 +71,14 @@
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lkdecore -lDCOP +kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_KDECORE) -lDCOP
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \ kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
mixertoolbox.cpp mixer_backend.cpp mixertoolbox.cpp mixer_backend.cpp
-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) -lqt-mt -lDCOP +kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
@ -89,7 +89,7 @@
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
-libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) -libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
+libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) -lqt-mt -lkdeui +libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI)
METASOURCES = AUTO METASOURCES = AUTO
@ -111,12 +111,12 @@
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \ -lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL) - -lartsflow -lsoundserver_idl -lartskde $(LIBDL)
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) -lqt-mt -lDCOP + -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) -libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) -lqt-mt -lkdecore +libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
METASOURCES = AUTO METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun META_INCLUDES = $(srcdir)/noatun

@ -5,7 +5,7 @@
weatherbutton.cpp weatherbutton.cpp
weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) weather_panelapplet_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-weather_panelapplet_la_LIBADD = $(LIB_KHTML) -weather_panelapplet_la_LIBADD = $(LIB_KHTML)
+weather_panelapplet_la_LIBADD = $(LIB_KHTML) -lqt-mt -lDCOP +weather_panelapplet_la_LIBADD = $(LIB_KHTML) $(LIB_QT) -lDCOP
+ +
appletdir = $(kde_datadir)/kicker/applets appletdir = $(kde_datadir)/kicker/applets
@ -15,7 +15,7 @@
kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version kweatherreport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo -kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo
+kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo -lqt-mt -lDCOP -lkdecore -lkdeui +kweatherreport_la_LIBADD = $(LIB_KHTML) reportview.lo $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub kweatherreport_la_SOURCES = reportmain.cpp weatherservice.stub
KDE_ICON = kweather KDE_ICON = kweather

@ -1,26 +1,32 @@
# Default version for this component # Default version for this component
%define kdecomp libkdcraw %define kdecomp libkdcraw
%define version 3.5.13
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: Raw picture decoding C++ library (runtime) [Trinity] Summary: Raw picture decoding C++ library (runtime) [Trinity]
Version: %{?version} Version: 3.5.13
Release: %{?release}%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Environment/Libraries Group: Environment/Libraries
@ -39,9 +45,16 @@ BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: lcms-devel, libjpeg-devel, pkgconfig BuildRequires: lcms-devel, libjpeg-devel, pkgconfig
BuildRequires: automake autoconf libtool libtool-ltdl-devel BuildRequires: automake autoconf libtool
BuildRequires: gettext BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: libtool-ltdl-devel
%endif
%description %description
C++ interface around dcraw binary program used to decode RAW C++ interface around dcraw binary program used to decode RAW
picture files. picture files.
@ -66,30 +79,36 @@ library documentation is available on kdcraw.h header file.
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common
%build %build
unset QTDIR || : ; source /etc/profile.d/qt.sh unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean %clean
@ -102,19 +121,26 @@ export PATH="%{_bindir}:${PATH}"
%postun %postun
/sbin/ldconfig || : /sbin/ldconfig || :
%files %post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files -f %{kdecomp}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so.* %{tde_libdir}/libkdcraw.so.4
%{_datadir}/icons/*/*/*/kdcraw.png %{tde_libdir}/libkdcraw.so.4.0.3
%{_datadir}/locale/*/LC_MESSAGES/libkdcraw.mo %{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so %{tde_libdir}/libkdcraw.so
%{_libdir}/*.la %{tde_libdir}/libkdcraw.la
%{_includedir}/* %{tde_includedir}/libkdcraw/
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/libkdcraw.pc
%Changelog %Changelog
* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.11-1 * Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15

@ -1,26 +1,32 @@
# Default version for this component # Default version for this component
%define kdecomp libkexiv2 %define kdecomp libkexiv2
%define version 3.5.13
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] Summary: Qt like interface for the libexiv2 library (runtime) [Trinity]
Version: %{?version} Version: 3.5.13
Release: %{?release}%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Environment/Libraries Group: Environment/Libraries
@ -34,13 +40,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz Source0: %{kdecomp}-3.5.13.tar.gz
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel >= 3.5.13
BuildRequires: trinity-arts-devel BuildRequires: trinity-arts-devel >= 3.5.13
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel >= 3.5.13
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: exiv2-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: automake autoconf libtool libtool-ltdl-devel BuildRequires: automake autoconf libtool
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}exiv2-devel
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: exiv2-devel
BuildRequires: libtool-ltdl-devel
%endif
%description %description
libkexif2 contains the library of libkexiv2. libkexif2 contains the library of libkexiv2.
@ -63,27 +76,31 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g" -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common
%build %build
unset QTDIR || : ; source /etc/profile.d/qt.sh unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
@ -99,17 +116,24 @@ export PATH="%{_bindir}:${PATH}"
%postun %postun
/sbin/ldconfig || : /sbin/ldconfig || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so.* %{tde_libdir}/libkexiv2.so.*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so %{tde_libdir}/libkexiv2.so
%{_libdir}/*.la %{tde_libdir}/libkexiv2.la
%{_includedir}/* %{tde_includedir}/libkexiv2/
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/libkexiv2.pc
%Changelog %Changelog
* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.11-1 * Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15

@ -1,26 +1,33 @@
# Default version for this component # Default version for this component
%define kdecomp libkipi %define kdecomp libkipi
%define version 3.5.13
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # 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 _variant .opt
%define _docdir %{_prefix}/share/doc
%endif %endif
# TDE 3.5.13 specific building variables # TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4 %define tde_bindir %{tde_prefix}/bin
%define tde_docdir %{_docdir}/kde %define tde_datadir %{tde_prefix}/share
%define tde_includedir %{_includedir}/kde %define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{_libdir}/trinity %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/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} Name: trinity-%{kdecomp}
Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity]
Version: %{?version} Version: 3.5.13
Release: %{?release}%{?dist}%{?_variant} Release: 1%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Environment/Libraries Group: Environment/Libraries
@ -39,9 +46,15 @@ BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: lcms-devel, libjpeg-devel, pkgconfig BuildRequires: lcms-devel, libjpeg-devel, pkgconfig
BuildRequires: automake autoconf libtool libtool-ltdl-devel BuildRequires: automake autoconf libtool
BuildRequires: gettext BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
%else
BuildRequires: libtool-ltdl-devel
%endif
%description %description
Libkipi is a library Libkipi is a library
o that contains common routines and widget used by kipi-plugins o that contains common routines and widget used by kipi-plugins
@ -71,8 +84,8 @@ Homepage: http://www.kipi-plugins.org/
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \ %__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -80,21 +93,26 @@ Homepage: http://www.kipi-plugins.org/
%build %build
unset QTDIR || : ; source /etc/profile.d/qt.sh unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \ %configure \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--disable-rpath \ --disable-rpath \
--with-extra-includes=%{_includedir}/tqt --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang %{kdecomp}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -106,21 +124,27 @@ export PATH="%{_bindir}:${PATH}"
%postun %postun
/sbin/ldconfig || : /sbin/ldconfig || :
%files %post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files -f %{kdecomp}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so.* %{tde_libdir}/libkipi.so.0
%{_datadir}/apps/kipi/data/*.png %{tde_libdir}/libkipi.so.0.1.1
%{_datadir}/icons/*/*/*/kipi.png %{tde_datadir}/apps/kipi/
%{_datadir}/locale/*/LC_MESSAGES/libkipi.mo %{tde_datadir}/icons/hicolor/*/apps/kipi.png
%{_datadir}/servicetypes/kipiplugin.desktop %{tde_datadir}/servicetypes/kipiplugin.desktop
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so %{tde_libdir}/libkipi.so
%{_libdir}/*.la %{tde_libdir}/libkipi.la
%{_includedir}/* %{tde_includedir}/libkipi/
%{_libdir}/pkgconfig/*.pc %{tde_libdir}/pkgconfig/libkipi.pc
%Changelog %Changelog
* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.11-1 * Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15

Loading…
Cancel
Save