TDE 3.5.13 stable release for RHEL/Fedora

v3.5.13-sru
albator 13 years ago
parent f16f2e4b84
commit 0061571b57

@ -72,3 +72,10 @@
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
@@ -1852,7 +1852,7 @@
fi
if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi

@ -26,6 +26,9 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{?_prefix}" == "/usr"
Obsoletes: k3b
%endif
@ -33,10 +36,6 @@ Obsoletes: k3b
Group: Applications/Archiving
License: GPLv2+
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: libdvdread-devel
%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
BuildRequires: libmpcdec-devel
%else
BuildRequires: musepack-tools-devel

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -26,12 +26,16 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{?_prefix}" == "/usr"
Obsoletes: k3b
%endif
Group: Applications/Archiving
License: GPLv2+
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
@ -53,7 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: libdvdread-devel
%if 0%{?fedora} >= 15
%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
BuildRequires: libmpcdec-devel
%else
BuildRequires: musepack-tools-devel
@ -92,7 +96,9 @@ start.
Summary: Common files of %{name}
Group: Applications/Archiving
Requires: %{name} = %{version}-%{release}
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildArch: noarch
%endif
%description common
%{summary}.
@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -24,3 +24,15 @@ kdeaddons
kdewebdev
kde-i18n
applications/k3b
applications/abakus
applications/dolphin
applications/gwenview
applications/krename
applications/yakuake
#applications/desktop-effects-kde
applications/filelight
applications/kdiff3
#applications/kuickshow
#applications/basket
#applications/katapult
#compizconfig-backend-kconfig

@ -1,8 +1,8 @@
# Default version for this component
%if "%{?version}" == ""
%define version 1.5.10
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -120,6 +120,9 @@ cd build
%changelog
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 1.5.10-0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -78,6 +78,9 @@ cd build
%{_libdir}/pkgconfig/*.pc
%changelog
* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre-0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13.0
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -1,6 +1,6 @@
Name: libcaldav
Version: 0.6.5
Release: 2debian2%{?dist}
Release: 2debian2.1%{?dist}
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
@ -17,6 +17,7 @@ Source0: libcaldav_0.6.5-2debian2.tar.gz
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older)
BuildRequires: trinity-libcurl-devel
%endif
@ -67,5 +68,5 @@ autoreconf --force --install --symlink
%Changelog
* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2
- Initial build for RHEL 6.0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2.1
- Initial build for RHEL 6, RHEL 5, and Fedora 15

@ -1,6 +1,6 @@
Name: libcarddav
Version: 0.6.2
Release: 2debian2%{?dist}
Release: 2debian2.1%{?dist}
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
@ -66,5 +66,5 @@ autoreconf --force --install --symlink
%Changelog
* Fri Oct 21 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2
- Initial build for RHEL 6.0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1
- Initial build for RHEL 6, RHEL 5, and Fedora 15

File diff suppressed because it is too large Load Diff

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -80,18 +80,14 @@ cd build
%__mkdir_p %{?buildroot}%{_includedir}
%__make install DESTDIR=%{?buildroot} -C build
# RHEL 5: add newline at end of include files
# RHEL 5: add newline at end of include files to avoid warnings
%if 0%{?rhel} && 0%{?rhel} <= 5
for i in %{?buildroot}%{_includedir}/*.h; do
echo "" >>${i}
done
%endif
# Fix 'tqt.pc': UIC executable is not correct
#sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \
# -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,'
# Install 'cmake' modules for a specific package (for later use)
# Install 'cmake' modules for development use
%__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do
install -m 644 $i %{?buildroot}%{cmake_modules_dir}
@ -113,6 +109,9 @@ done
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Aug 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -21,7 +21,7 @@ EOF
exit 1
fi
select COMP in $( cut -f1 "components.txt" ) ; do
select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do
# Gets package version from 'components.txt' file
VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )

@ -15,7 +15,7 @@ EOF
##### CHOOSE A TDE COMPONENT #####
PS3="Enter number: "
select COMP in $( cut -f1 components.txt ) ; do
select COMP in $( cut -f1 components.txt | grep -v "^#" ) ; do
ARCHIVEDIR="${PWD}/${COMP}"
[ -d "${ARCHIVEDIR}" ] || mkdir -p "${ARCHIVEDIR}"
@ -67,6 +67,7 @@ select COMP in $( cut -f1 components.txt ) ; do
;;
"qt3")
echo "Extracting '${COMP}' from GIT ..."
ARCHIVENAME="qt3-3.3.8d.tar.gz"
git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 .
;;
*)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -1224,26 +1224,11 @@ rm -rf %{buildroot}
%endif
%changelog
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
- Add support for RHEL5
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
- Re-introduce all languages
* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Re-introduce all languages
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Correct macro to install under "/opt", if desired
* Thu Jul 21 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Add 'Patch1': translation for 'Open Terminal Here...' background shortcut
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Rebuilt
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial version (French language only)
- Based on RHEL SPEC file 'kde-i18n'
- Add 'patch0' to reflect modifications in 'kdesu' from 'kdebase' package
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -184,7 +184,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6
- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"
- Import to GIT
- Spec file based on Fedora 8 "kdeaccessibility-3.5.10-1"

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -38,8 +38,6 @@ Source2: metabarrc
Patch3: kdeaddons-3.5.3-sdl.patch
Patch100: svn.patch
BuildRequires: trinity-kdebase-devel
BuildRequires: trinity-kdegames-devel
BuildRequires: trinity-kdemultimedia-devel
@ -86,8 +84,6 @@ This package includes:
%patch3 -p1 -b .sdl
%patch100 -p2
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \
@ -252,6 +248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Initial build for RHEL 6
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -193,6 +193,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Fri Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -42,7 +42,11 @@ Source1: webcollagerc
BuildRequires: gettext
BuildRequires: trinity-kdebase-devel
BuildRequires: nas-devel esound-devel jack-audio-connection-kit-devel
%if 0%{?rhel} > 5 || 0%{?fedora} >= 15
BuildRequires: xscreensaver
%else
BuildRequires: gnome-screensaver
%endif
%if "%{?with_libart}" == "1"
BuildRequires: libart_lgpl-devel
%endif
@ -176,5 +180,8 @@ done
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -41,8 +41,6 @@ Source0: kdebase-%{version}.tar.gz
# Wrapper script to prevent Plasma launch at Trinity Startup
Source1: plasma-desktop
Patch100: svn.patch
# TDE for RHEL/Fedora specific patches
# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
@ -162,8 +160,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch5 -p1
%patch6 -p1
%patch100 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -223,7 +219,7 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg
# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
%if "%{?_prefix}" != "/usr"
%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
%endif
%clean
@ -489,6 +485,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12.99-0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT
- Use TDE 3.5.13, cmake, QT3.3.3.8d

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -29,11 +29,10 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Source0: kdebindings-%{version}.tar.gz
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdebindings-%{version}.tar.gz
# RedHat Legacy patches (from Fedora)
Patch1: kdebindings-3.5.6-libgcj.patch
@ -257,8 +256,8 @@ update-desktop-database >& /dev/null ||:
# Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6)
%if "%{?_prefix}" == "/usr"
%exclude %{_bindir}/kjscmd
%exclude %{_mandir}/man1/kjscmd*
%endif
%exclude %{_mandir}/man1/kjscmd*
%files dcopperl -f %{name}-dcopperl.list
@ -278,6 +277,9 @@ update-desktop-database >& /dev/null ||:
%{ruby_arch}/*.la
%changelog
* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.12.99.20110903-0
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr - 3.5.13-0
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -34,8 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeedu-%{version}.tar.gz
Patch100: svn.patch
Provides: kdeedu3 = %{version}-%{release}
Requires(post): /sbin/ldconfig
@ -98,8 +96,6 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kdeedu
%patch100 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \
@ -234,5 +230,8 @@ update-desktop-database >& /dev/null ||:
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -192,5 +192,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6
- Import to GIT

@ -0,0 +1,11 @@
--- kdegraphics.ORI/kfile-plugins/dependencies/CMakeLists.txt 2011-07-31 08:24:04.000000000 +0200
+++ kdegraphics/kfile-plugins/dependencies/CMakeLists.txt 2011-10-30 14:42:03.000000000 +0100
@@ -9,4 +9,6 @@
#
#################################################
-add_subdirectory( poppler-tqt )
\ Pas de fin de ligne à la fin du fichier.
+if( WITH_PDF )
+ add_subdirectory( poppler-tqt )
+endif ( )

@ -0,0 +1,16 @@
diff -Nuar kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake kdegraphics/kpovmodeler/ConfigureChecks.cmake
--- kdegraphics.ORI/kpovmodeler/ConfigureChecks.cmake 2011-05-11 22:40:19.000000000 +0200
+++ kdegraphics/kpovmodeler/ConfigureChecks.cmake 2011-10-30 14:00:54.000000000 +0100
@@ -12,7 +12,10 @@
# glu
pkg_search_module( GLU glu )
if( NOT GLU_FOUND )
- tde_message_fatal( "glu is required, but was not found on your system" )
+ check_include_file ( GL/glu.h HAVE_GLU )
+ if( NOT HAVE_GLU )
+ tde_message_fatal( "glu is required, but was not found on your system" )
+ endif ( )
endif( )
kfile-plugins/dependencies/poppler-tqt/CMakeFiles/poppler-tqt-shared.dir/build.make

@ -0,0 +1,11 @@
diff -Nuar kdegraphics.ORI/ksnapshot/CMakeLists.txt kdegraphics/ksnapshot/CMakeLists.txt
--- kdegraphics.ORI/ksnapshot/CMakeLists.txt 2011-05-11 23:29:40.000000000 +0200
+++ kdegraphics/ksnapshot/CMakeLists.txt 2011-10-31 15:45:47.107958154 +0100
@@ -40,6 +40,6 @@
SOURCES
ksnapshotiface.skel main.cpp ksnapshot.cpp regiongrabber.cpp
windowgrabber.cpp ksnapshotwidget.ui
- LINK kdeprint-shared
+ LINK kdeprint-shared Xext
DESTINATION ${BIN_INSTALL_DIR}
)

@ -0,0 +1,11 @@
--- kdegraphics.ORI/kpdf/xpdf/aconf.h 2011-04-27 19:32:57.000000000 +0200
+++ kdegraphics/kpdf/xpdf/aconf.h 2011-10-30 14:54:24.000000000 +0100
@@ -7,7 +7,7 @@
#define HAVE_FREETYPE_FREETYPE_H HAVE_FREETYPE
#define OPI_SUPPORT 0
#define TEXTOUT_WORD_LIST 0
-#define HAVE_MKSTEMPS 1 //libkdefakes provides it
+#define HAVE_MKSTEMPS 0
#define HAVE_SPLASH 1
#define SPLASH_CMYK 1
#define HAVE_XPDFCORE 0

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -12,10 +12,16 @@
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
%define tde_docdir %{_docdir}
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity
# KDEGRAPHICS specific options
%if 0%{?rhel} && 0%{?rhel} <= 5
%define build_kpovmodeler 0
%else
%define build_kpovmodeler 1
%endif
Name: trinity-kdegraphics
Version: %{?version}
@ -30,8 +36,21 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdegraphics-%{version}.tar.gz
# TDE 3.5.13
## RHEL / Fedora specific patches
### [kdegraphics/ksnapshot] Missing -lXext in LDFLAGS (required for Fedora 15)
Patch0: kdegraphics-3.5.13-ksnapshot_ldflags.patch
### [kdegraphics/kpovmodeler] CMAKE does not detect GL/glu.h (on RHEL5)
Patch1: kdegraphics-3.5.13-kpovmodeler_check_glu.patch
### [kdegraphics/kfile-plugins/dependencies/poppler-tqt] Compile 'poppler-tqt' only if HAVE_POPPLER_016
Patch2: kdegraphics-3.5.13-disable_poppler.patch
### [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5
Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel
@ -44,6 +63,8 @@ BuildRequires: automake libtool
BuildRequires: gphoto2-devel
BuildRequires: sane-backends-devel
BuildRequires: libusb-devel
BuildRequires: t1lib-devel
BuildRequires: libdrm-devel
# kgamma
BuildRequires: libXxf86vm-devel
@ -53,7 +74,10 @@ BuildRequires: imlib-devel
BuildRequires: OpenEXR-devel
# kpdf
BuildRequires: freetype-devel
BuildRequires: poppler-devel
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: poppler-qt-devel
%endif
BuildRequires: libpaper-devel
# ksvg
BuildRequires: fontconfig-devel
@ -61,8 +85,11 @@ BuildRequires: fribidi-devel
BuildRequires: lcms-devel
BuildRequires: libart_lgpl-devel
BuildRequires: libXmu-devel
# kpovmodeler
%if 0%{?build_kpovmodeler}
BuildRequires: libGL-devel libGLU-devel libXi-devel
%endif
Requires: tqtinterface
Requires: trinity-arts
@ -108,7 +135,9 @@ Requires(postun): /sbin/ldconfig
%{summary}, including:
* kfax
* kfaxview
%if 0%{?build_kpovmodeler}
* kpovmodler
%endif
%package libs
Summary: %{name} runtime libraries
@ -123,49 +152,44 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n kdegraphics
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g"
%__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"
%patch0 -p1
%patch1 -p1
%patch2 -p1
%if 0%{?rhel} && 0%{?rhel} <= 5
%patch3 -p1
%endif
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
--disable-debug \
--disable-warnings \
--enable-final \
--enable-closure \
--includedir=%{_includedir}/kde \
--with-extra-includes=%{_includedir}/tqt
%if 0%{?fedora} >= 15
# Ugly fix for kolourpaint - problem when linking libkdefx.so
sed -i kolourpaint/Makefile \
-e 's,\($(kolourpaint_LINK) $(kolourpaint_OBJECTS) $(kolourpaint_LDADD) \)\($(LIBS)\),\1 -lkdefx \2,'
# Another ugly fix for kpdf - problem when linking fontconfig
sed -i kpdf/Makefile \
-e '/^LDFLAGS = .*/ s,$, -lfontconfig,'
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
export LD_LIBRARY_PATH="%{_libdir}"
%__mkdir build
cd build
%cmake \
-DWITH_T1LIB=ON \
-DWITH_LIBPAPER=ON \
-DWITH_TIFF=ON \
-DWITH_OPENEXR=ON \
%if 0%{?rhel} && 0%{?rhel} <= 5
-DWITH_PDF=OFF \
%else
-DWITH_PDF=ON \
%endif
-DBUILD_ALL=ON \
%if 0%{?build_kpovmodeler} == 0
-DBUILD_KPOVMODELER=OFF \
%endif
..
%__make %{?_smp_mflags}
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%__make install DESTDIR=%{buildroot} -C build
# locale's
%find_lang %{name} || touch %{name}.lang
@ -201,7 +225,7 @@ rm -f %{buildroot}/libkpovmodeler.so
%clean
rm -rf %{buildroot}
%__rm -rf %{buildroot}
%post
@ -263,8 +287,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/services/kfaxmultipage_tiff.desktop
# kpovmodeler
%if 0%{?build_kpovmodeler}
%doc rpmdocs/kpovmodeler/
%doc %{_docdir}/HTML/en/kpovmodeler/
%doc %{tde_docdir}/HTML/en/kpovmodeler/
%{_bindir}/kpovmodeler
%{_libdir}/libkpovmodeler.so.*
%{_libdir}/libkpovmodeler.la
@ -273,6 +298,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/apps/kpovmodeler/
%{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%endif
%files -f %{name}.lang
%defattr(-,root,root,-)
@ -297,6 +323,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/services/kfaxmultipage_tiff.desktop
# kpovmodeler
%if 0%{?build_kpovmodeler}
%exclude %{tde_docdir}/HTML/en/kpovmodeler/
%exclude %{_bindir}/kpovmodeler
%exclude %{_libdir}/libkpovmodeler.*
@ -305,6 +332,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/apps/kpovmodeler/
%exclude %{_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.*
%exclude %{_datadir}/icons/hicolor/*/apps/kpovmodeler.*
%endif
%{_bindir}/*
%{_datadir}/applications/kde/*.desktop
@ -317,12 +345,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/mimelnk/*/*
%{_libdir}/libkdeinit_*.so
%{tde_libdir}/*
%doc %lang(en) %{tde_docdir}/HTML/en/*
%files libs
%defattr(-,root,root,-)
%exclude %{_libdir}/libkfaximage.la
%if 0%{?build_kpovmodeler}
%exclude %{_libdir}/libkpovmodeler.la
%exclude %{_libdir}/libkpovmodeler.so.*
%endif
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
# Why ???
@ -330,7 +361,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files devel
%defattr(-,root,root,-)
%{_includedir}/kde/*
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
%{tde_includedir}/*
%endif
%{_includedir}/dom/*
%{_includedir}/ksvg/*
%{_includedir}/kviewshell/*
%{_includedir}/libtext2path-0.1/*
%{_includedir}/kmultipageInterface.h
%{_datadir}/cmake/*.cmake
%{_libdir}/lib*.so
#exclude %{_libdir}/libkpovmodeler.so
%exclude %{_libdir}/libkfaximage.so
@ -338,5 +377,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libdjvu.so
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
- RHEL 5 build has some features disabled (see patches)
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -281,6 +281,9 @@ EOF
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -394,6 +394,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6
- Import to GIT
- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -60,8 +60,6 @@ Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
Patch100: svn.patch
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: gettext
@ -181,8 +179,6 @@ Requires: %{name} = %{version}-%{release}
%patch4 -p1 -b .resolv
%patch6 -p1 -b .krfb_httpd
%patch100 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -469,6 +465,9 @@ done
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Tue Oct 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial version
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -144,5 +144,8 @@ export PATH="%{_bindir}:${PATH}"
%{_datadir}/cmake/*.cmake
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -213,6 +213,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -157,6 +157,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Fri Oct 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial version for RHEL 6 and Fedora 15
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -339,6 +339,9 @@ done
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Mon Sep 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -229,6 +229,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Sat Oct 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6 and Fedora 15
- Import to GIT
- Based on SPEC file from Fedora: kdevelop 9:3.5.3-1

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -224,5 +224,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Initial build for RHEL 6 / Fedora 15
- Import to GIT

Loading…
Cancel
Save