diff options
Diffstat (limited to 'redhat/kdelibs/trinity-kdelibs-3.5.12.spec')
| -rwxr-xr-x | redhat/kdelibs/trinity-kdelibs-3.5.12.spec | 76 |
1 files changed, 61 insertions, 15 deletions
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec index 6207fc5c1..7732731f0 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 8 +%define release 10 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -38,6 +38,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdelibs-%{version}.tar.gz +# TDE 3.5.12 patches for RHEL/Fedora build +## [kdelibs/kio/kio] Removes the maximum line length detection +Patch0: kdelibs-3.5.13-maxlinelength.patch +## [kdecore] sets TDE 3.5.12 defaults directories +Patch1: kdelibs-3.5.12-kstandarddirs_trinity.patch +## [kdelibs/kdecore] fixed a conflict between fixx11h.h and Xdefs.h +Patch2: kdelibs-3.5.12-fixx11h.patch + BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel @@ -52,6 +60,11 @@ BuildRequires: alsa-lib-devel BuildRequires: libidn-devel BuildRequires: qt%{?_qt_suffix}-devel BuildRequires: avahi-qt3-devel +BuildRequires: jasper-devel +BuildRequires: libtiff-devel +BuildRequires: OpenEXR-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: glib2-devel Requires: tqtinterface Requires: trinity-arts @@ -59,8 +72,10 @@ Requires: avahi Requires: qt%{?_qt_suffix} Requires: avahi-qt3 + +#Provides: kdelibs%{?_qt_suffix} = %{version} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs%{?_qt_suffix} +Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10 %endif %description @@ -75,8 +90,9 @@ kimgio (image manipulation). Summary: %{name} - Development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: kdelibs%{?_qt_suffix}-devel = %{version} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs%{?_qt_suffix}-devel +Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10 %endif %description devel @@ -87,19 +103,24 @@ applications for TDE. Group: Development/Libraries Summary: %{name} - API documentation Requires: %{name} = %{version}-%{release} +Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} %if "%{?_prefix}" == "/usr" -Obsoletes: kdelibs%{?_qt_suffix}-apidocs-devel +Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10 %endif %description apidocs This package includes the TDE API documentation in HTML format for easy browsing + %prep %setup -q -n kdelibs +%patch0 -p1 +%patch1 -p1 +%patch2 -p3 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -111,7 +132,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" # On older RHEL, libXrandr is too old so krandr cannot be compiled. # Kspell2 does not compile either. -%if 0%{?rhel} && 0%{?rhel} < 6 +%if 0%{?rhel} && 0%{?rhel} <= 5 export DO_NOT_COMPILE="krandr" %endif @@ -147,13 +168,22 @@ export DO_NOT_COMPILE="krandr" %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} -%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d -cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf %if "%{?_prefix}" != "/usr" +%__mkdir_p "%{?buildroot}%{_sysconfdir}/ld.so.conf.d" +cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf" %{_libdir} -%endif -%{tde_libdir} EOF +%endif + +# Moves the XDG configuration files to TDE directory +%if "%{_prefix}" != "/usr" +%__install -p -D -m644 \ + "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ + "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu" +%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" +%else +%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu" +%endif %clean @@ -167,8 +197,7 @@ EOF %files %defattr(-,root,root,-) -%doc README -%doc COPYING.LIB +%doc AUTHORS COPYING* README TODO %{_bindir}/artsmessage %{_bindir}/cupsdconf %{_bindir}/cupsdoprint @@ -266,10 +295,17 @@ EOF %exclude %{_datadir}/locale/all_languages %exclude %{tde_docdir}/HTML/en/common/* %endif +# ld.so.conf needed only if installed under '/opt/trinity' +%if "%{?_prefix}" != "/usr" %{_sysconfdir}/ld.so.conf.d/trinity.conf +%endif -# Provided by 'redhat-menus' package -%exclude %{_sysconfdir}/xdg/menus/applications.menu +# Avoid conflict with 'redhat-menus' package +%if "%{_prefix}" == "/usr" +%{_sysconfdir}/xdg/menus/kde-applications.menu +%else +%{_prefix}/etc/xdg/menus/kde-applications.menu +%endif %files devel %defattr(-,root,root,-) @@ -289,6 +325,17 @@ EOF %changelog +* Fri Dec 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-10 +- Fix conflict with distro-provided KDE +- Fix HTML directory location +- Change defaults TDE directory to '/etc/trinity' and '~/.trinity' +- Removes 'ld.so.conf.d' when installed under '/usr' + +* Sun Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9 +- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE +- Disable 'max line length' detection +- Add missing BuildRequires + * Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8 - Add support for RHEL 5. @@ -318,4 +365,3 @@ EOF * Wed Dec 14 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0 - Initial version - |