summaryrefslogtreecommitdiffstats
path: root/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/kdelibs/trinity-kdelibs-3.5.13.spec')
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec326
1 files changed, 180 insertions, 146 deletions
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 85e6f5e05..89e939507 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -1,16 +1,23 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific variables
-%define tde_docdir %{_docdir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
Name: trinity-tdelibs
Version: 3.5.13
-Release: 10%{?dist}%{?_variant}
+Release: 11%{?dist}%{?_variant}
License: GPL
Summary: TDE Libraries
Group: Environment/Libraries
@@ -71,12 +78,21 @@ Patch27: kdelibs-3.5.13-add_dynamic_label_to_kpassword.patch
Patch28: kdelibs-3.5.13-fix_build_kspell2.patch
## [tdelibs] Export kdemain symbol in iso kioslave [Bug #465] [Commit #0536f0b7]
Patch29: kdelibs-3.5.13-fix_iso_kioslave.patch
+## [tdelibs] Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
+Patch30: kdelibs-3.5.13-fix_iso_kioslave_not_parsing_large_image_properly.patch
+## [tdelibs] Add ability to set KLed off color [Commit #513ffc6e]
+Patch31: kdelibs-3.5.13-add_ability_to_set_kled_off_color.patch
+## [tdelibs] Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
+Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch
+## [tdelibs] Update iso kioslave to better handle large images [Commit #dca4c677]
+Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch
+## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
+Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
-BuildRequires: avahi-devel
BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
BuildRequires: libutempter-devel
BuildRequires: bzip2-devel
@@ -85,25 +101,34 @@ BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel
BuildRequires: libidn-devel
BuildRequires: qt3-devel
-BuildRequires: avahi-qt3-devel
BuildRequires: jasper-devel
BuildRequires: libtiff-devel
BuildRequires: OpenEXR-devel
-BuildRequires: libtool-ltdl-devel
BuildRequires: glib2-devel
BuildRequires: gamin-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libXcomposite-devel
BuildRequires: aspell-devel
BuildRequires: hspell-devel
+BuildRequires: avahi-tqt-devel >= 3.5.13
# LUA support are not ready yet
#BuildRequires: lua-devel
-Requires: tqtinterface
-Requires: trinity-arts
+%if 0%{?mgaversion}
+BuildRequires: %{_lib}avahi-client-devel
+BuildRequires: %{_lib}ltdl-devel
+BuildRequires: x11-proto-devel
+BuildRequires: %{_lib}xcomposite1-devel
+Requires: %{_lib}avahi-client3
+%else
+BuildRequires: avahi-devel
+BuildRequires: libtool-ltdl-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: libXcomposite-devel
+%endif
+
+Requires: tqtinterface >= 3.5.13
+Requires: trinity-arts >= 3.5.13
Requires: avahi
-Requires: qt3
-Requires: avahi-qt3
+Requires: qt3 >= 3.3.8.d
%description
Libraries for the Trinity Desktop Environment:
@@ -115,103 +140,103 @@ kimgio (image manipulation).
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO
-%{_bindir}/artsmessage
-%{_bindir}/cupsdconf
-%{_bindir}/cupsdoprint
-%{_bindir}/dcop
-%{_bindir}/dcopclient
-%{_bindir}/dcopfind
-%{_bindir}/dcopobject
-%{_bindir}/dcopquit
-%{_bindir}/dcopref
-%{_bindir}/dcopserver
-%{_bindir}/dcopserver_shutdown
-%{_bindir}/dcopstart
-%{_bindir}/filesharelist
-%{_bindir}/fileshareset
-%{_bindir}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_bindir}/kcmshell
-%{_bindir}/kconf_update
-%{_bindir}/kcookiejar
-%{_bindir}/kde-config
-%{_bindir}/kde-menu
-%{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
-%{_bindir}/kdontchangethehostname
-%{_bindir}/kdostartupconfig
-%{_bindir}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/khotnewstuff
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/kmimelist
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/kstartupconfig
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/meinproc
-%{_bindir}/networkstatustestservice
-%{_bindir}/start_kdeinit
-%{_bindir}/start_kdeinit_wrapper
-%attr(4755,root,root) %{_bindir}/kgrantpty
-%{_libdir}/lib*.so.*
-%{_libdir}/lib[kt]deinit_*.la
-%{_libdir}/lib[kt]deinit_*.so
-%{tde_libdir}/
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/autostart/kab2kabc.desktop
-%{_datadir}/applnk/kio_iso.desktop
-%{_datadir}/apps/*
-%exclude %{_datadir}/apps/ksgmltools2/
-%config(noreplace) %{_datadir}/config/*
-%{_datadir}/emoticons/*
-%{_datadir}/icons/default.kde
-%{_datadir}/mimelnk/magic
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_datadir}/icons/crystalsvg/
-%{tde_docdir}/HTML/en/kspell
+%{tde_bindir}/artsmessage
+%{tde_bindir}/cupsdconf
+%{tde_bindir}/cupsdoprint
+%{tde_bindir}/dcop
+%{tde_bindir}/dcopclient
+%{tde_bindir}/dcopfind
+%{tde_bindir}/dcopobject
+%{tde_bindir}/dcopquit
+%{tde_bindir}/dcopref
+%{tde_bindir}/dcopserver
+%{tde_bindir}/dcopserver_shutdown
+%{tde_bindir}/dcopstart
+%{tde_bindir}/filesharelist
+%{tde_bindir}/fileshareset
+%{tde_bindir}/imagetops
+%{tde_bindir}/kab2kabc
+%{tde_bindir}/kaddprinterwizard
+%{tde_bindir}/kbuildsycoca
+%{tde_bindir}/kcmshell
+%{tde_bindir}/kconf_update
+%{tde_bindir}/kcookiejar
+%{tde_bindir}/kde-config
+%{tde_bindir}/kde-menu
+%{tde_bindir}/kded
+%{tde_bindir}/kdeinit
+%{tde_bindir}/kdeinit_shutdown
+%{tde_bindir}/kdeinit_wrapper
+%{tde_bindir}/kdesu_stub
+%{tde_bindir}/kdontchangethehostname
+%{tde_bindir}/kdostartupconfig
+%{tde_bindir}/kfile
+%{tde_bindir}/kfmexec
+%{tde_bindir}/khotnewstuff
+%{tde_bindir}/kinstalltheme
+%{tde_bindir}/kio_http_cache_cleaner
+%{tde_bindir}/kio_uiserver
+%{tde_bindir}/kioexec
+%{tde_bindir}/kioslave
+%{tde_bindir}/klauncher
+%{tde_bindir}/kmailservice
+%{tde_bindir}/kmimelist
+%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
+%{tde_bindir}/ksendbugmail
+%{tde_bindir}/kshell
+%{tde_bindir}/kstartupconfig
+%{tde_bindir}/ktelnetservice
+%{tde_bindir}/ktradertest
+%{tde_bindir}/kwrapper
+%{tde_bindir}/lnusertemp
+%{tde_bindir}/make_driver_db_cups
+%{tde_bindir}/make_driver_db_lpr
+%{tde_bindir}/meinproc
+%{tde_bindir}/networkstatustestservice
+%{tde_bindir}/start_kdeinit
+%{tde_bindir}/start_kdeinit_wrapper
+%attr(4755,root,root) %{tde_bindir}/kgrantpty
+%{tde_tdelibdir}/*
+%{tde_libdir}/lib*.so.*
+%{tde_libdir}/lib[kt]deinit_*.la
+%{tde_libdir}/lib[kt]deinit_*.so
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/autostart/kab2kabc.desktop
+%{tde_datadir}/applnk/kio_iso.desktop
+%{tde_datadir}/apps/*
+%exclude %{tde_datadir}/apps/ksgmltools2/
+%config(noreplace) %{tde_datadir}/config/*
+%{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/default.kde
+%{tde_datadir}/mimelnk/magic
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/services/*
+%{tde_datadir}/servicetypes/*
+%{tde_datadir}/icons/crystalsvg/
+%{tde_tdedocdir}/HTML/en/kspell/
# remove conflicts with kdelibs-4
%if "%{?_prefix}" != "/usr"
-%{_bindir}/checkXML
-%{_bindir}/ksvgtopng
-%{_bindir}/kunittestmodrunner
-%{_bindir}/preparetips
-%{_datadir}/icons/hicolor/index.theme
-%{_datadir}/locale/all_languages
-%{tde_docdir}/HTML/en/common/*
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/kunittestmodrunner
+%{tde_bindir}/preparetips
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
+%{tde_tdedocdir}/HTML/en/common/*
%{_sysconfdir}/ld.so.conf.d/trinity.conf
%else
-%exclude %{_bindir}/checkXML
-%exclude %{_bindir}/ksvgtopng
-%exclude %{_bindir}/kunittestmodrunner
-%exclude %{_bindir}/preparetips
-%exclude %{_datadir}/config/colors
-%exclude %{_datadir}/config/kdebug.areas
-%exclude %{_datadir}/config/kdebugrc
-%exclude %{_datadir}/config/ksslcalist
-%exclude %{_datadir}/config/ui/ui_standards.rc
-%exclude %{_datadir}/icons/hicolor/index.theme
-%exclude %{_datadir}/locale/all_languages
-%exclude %{tde_docdir}/HTML/en/common/*
+%exclude %{tde_bindir}/checkXML
+%exclude %{tde_bindir}/ksvgtopng
+%exclude %{tde_bindir}/kunittestmodrunner
+%exclude %{tde_bindir}/preparetips
+%exclude %{tde_datadir}/config/colors
+%exclude %{tde_datadir}/config/kdebug.areas
+%exclude %{tde_datadir}/config/kdebugrc
+%exclude %{tde_datadir}/config/ksslcalist
+%exclude %{tde_datadir}/config/ui/ui_standards.rc
+%exclude %{tde_datadir}/icons/hicolor/index.theme
+%exclude %{tde_datadir}/locale/all_languages
+%exclude %{tde_tdedocdir}/HTML/en/common/*
%endif
# Avoid conflict with 'redhat-menus' package
@@ -222,11 +247,13 @@ kimgio (image manipulation).
%endif
# New in TDE 3.5.13
-%{_bindir}/kdetcompmgr
+%{tde_bindir}/kdetcompmgr
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig || :
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig || :
##########
@@ -246,40 +273,25 @@ applications for TDE.
%files devel
%defattr(-,root,root,-)
-%{_bindir}/dcopidl*
-%{_bindir}/kconfig_compiler
-%{_bindir}/makekdewidgets
-%{_datadir}/apps/ksgmltools2/
-%{_includedir}/*
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/*.a
-%exclude %{_libdir}/libkdeinit_*.la
-%exclude %{_libdir}/libkdeinit_*.so
+%{tde_bindir}/dcopidl*
+%{tde_bindir}/kconfig_compiler
+%{tde_bindir}/makekdewidgets
+%{tde_datadir}/apps/ksgmltools2/
+%{tde_includedir}/*
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/*.a
+%exclude %{tde_libdir}/libkdeinit_*.la
+%exclude %{tde_libdir}/libkdeinit_*.so
# New in TDE 3.5.13
-%{_datadir}/cmake/kdelibs.cmake
+%{tde_datadir}/cmake/kdelibs.cmake
-%post devel -p /sbin/ldconfig
+%post devel
+/sbin/ldconfig || :
-%postun devel -p /sbin/ldconfig
-
-##########
-
-%if 0
-%package apidocs
-Group: Development/Libraries
-Summary: %{name} - API documentation
-Requires: %{name} = %{version}-%{release}
-
-%description apidocs
-This package includes the TDE API documentation in HTML
-format for easy browsing
-
-%files apidocs
-%defattr(-,root,root,-)
-#%{tde_docdir}/HTML/en/kdelibs*
-%endif
+%postun devel
+/sbin/ldconfig || :
##########
@@ -304,18 +316,33 @@ format for easy browsing
%patch26 -p1
%patch27 -p1
%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{_libdir}"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-%__mkdir build
-cd build
+# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
+export LD_LIBRARY_PATH="%{tde_libdir}"
+
+
+%{?!mgaversion:%__mkdir build; cd build}
%cmake \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DDOC_INSTALL_DIR=%{tde_docdir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCMAKE_SKIP_RPATH="OFF" \
-DWITH_ARTS=ON \
-DWITH_ALSA=ON \
-DWITH_LIBART=ON \
@@ -345,7 +372,7 @@ cd build
%if "%{?_prefix}" != "/usr"
%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%{_libdir}
+%{tde_libdir}
EOF
%endif
@@ -365,6 +392,13 @@ EOF
%changelog
+* Sun Jul 22 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
+- Fix iso kioslave not parsing large images properly [Commit #b4bba7b5]
+- Add ability to set KLed off color [Commit #513ffc6e]
+- Fix spinbox text entry when base is not 10 [Commit #d1c71f69]
+- Update iso kioslave to better handle large images [Commit #dca4c677]
+- Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770]
+
* Tue Jun 26 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
- Renames to 'trinity-tdelibs'
- Enable 'aspell', 'hspell' and 'libidn'
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 17:41:47 +0000