diff options
Diffstat (limited to 'redhat/main/tdelibs')
-rw-r--r-- | redhat/main/tdelibs/tdelibs-14.0.0.patch | 204 | ||||
-rw-r--r-- | redhat/main/tdelibs/tdelibs-14.0.0.spec | 26 | ||||
-rw-r--r-- | redhat/main/tdelibs/tdelibs-14.0.1.spec | 704 |
3 files changed, 53 insertions, 881 deletions
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.patch b/redhat/main/tdelibs/tdelibs-14.0.0.patch index 77b2c2cce..ab309f841 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.patch +++ b/redhat/main/tdelibs/tdelibs-14.0.0.patch @@ -1,173 +1,31 @@ -From 608ee3f53763ca7fe4e925e8309525c78d937984 Mon Sep 17 00:00:00 2001 -From: Slávek Banko <slavek.banko@axis.cz> -Date: Thu, 25 Dec 2014 18:10:23 +0000 -Subject: Fix FTBFS because CUPS 2.x - -This resolves Bug 2270 - -Signed-off-by: Slávek Banko <slavek.banko@axis.cz> -(cherry picked from commit 592bebb509786ccec893b305d3ae6a0c76ed3bdb) ---- -diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c -index eadd6b6..3772b35 100644 ---- a/tdeprint/cups/cupsdconf2/cups-util.c -+++ b/tdeprint/cups/cupsdconf2/cups-util.c -@@ -33,7 +33,7 @@ cupsGetConf(void) - char prompt[1024]; /* Prompt string */ - int digest_tries; /* Number of tries with Digest */ - static char filename[HTTP_MAX_URI]; /* Local filename */ --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - const char *fqdn = 0; - #else - char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */ -@@ -119,7 +119,7 @@ cupsGetConf(void) - * See if we should retry the current digest password... - */ - --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE]; - #else - www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ); -@@ -130,7 +130,7 @@ cupsGetConf(void) - /* - * Nope - get a password from the user... - */ --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - fqdn = cups_server->hostname; - #else - httpGetHostname( cups_server, fqdn, sizeof( fqdn ) ); -@@ -155,7 +155,7 @@ cupsGetConf(void) - * Got a password; encode it for the server... - */ - --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE]; - #else - www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ); -@@ -167,7 +167,7 @@ cupsGetConf(void) - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); - #else - httpEncode64(encode, plain); -@@ -236,7 +236,7 @@ cupsGetConf(void) - */ - - while ((bytes = --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpRead - #else - httpRead2 -@@ -266,7 +266,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - http_status_t status; /* HTTP status from server */ - char prompt[1024]; /* Prompt string */ - int digest_tries; /* Number of tries with Digest */ --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - const char *fqdn = 0; - #else - char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */ -@@ -341,7 +341,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - break; - } - else --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpWrite - #else - httpWrite2 -@@ -350,7 +350,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - - if (status == HTTP_CONTINUE) - { --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpWrite - #else - httpWrite2 -@@ -381,7 +381,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - * See if we should retry the current digest password... - */ - --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE]; - #else - www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ); -@@ -394,7 +394,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - */ - - --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - fqdn = cups_server->hostname; - #else - httpGetHostname( cups_server, fqdn, sizeof( fqdn ) ); -@@ -418,7 +418,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - * Got a password; encode it for the server... - */ - --#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE]; - #else - www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ); -@@ -430,7 +430,7 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); - #else - httpEncode64(encode, plain); -@@ -512,7 +512,7 @@ cups_local_auth(http_t *http) /* I - Connection */ - * See if we are accessing localhost... - the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) - */ --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - if (!httpAddrLocalhost(http)) - #else - if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && -diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp -index b4e3991..8a36315 100644 ---- a/tdeprint/cups/ipprequest.cpp -+++ b/tdeprint/cups/ipprequest.cpp -@@ -407,7 +407,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) - } - - #ifdef HAVE_CUPS_NO_PWD_CACHE --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE ); - #else - httpSetAuthString( HTTP, NULL, cups_authstring.data() ); -@@ -421,7 +421,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) - - request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); - #ifdef HAVE_CUPS_NO_PWD_CACHE --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2 -+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - cups_authstring = HTTP->authstring; - #else - cups_authstring = httpGetAuthString( HTTP ); -@@ -757,7 +757,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts) - cupsFreeOptions(n, options); - - // find an remove that annoying "document-format" attribute --#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME); - ippDeleteAttribute(request_, attr); - #else --- -cgit v0.9.0.2-52-g1de3 +diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h +index b5fddb8..1269c36 100644 +--- a/tdecore/tdeglobal.h ++++ b/tdecore/tdeglobal.h +@@ -25,8 +25,10 @@ class KCharsets; + class TDEConfig; + class TDESharedConfig; + class TDEIconLoader; ++#ifdef __TDE_HAVE_TDEHWLIB + class TDEHardwareDevices; + class TDEGlobalNetworkManager; ++#endif + class TDELocale; + class TDEStandardDirs; + class KStaticDeleterBase; +@@ -79,6 +81,7 @@ public: + */ + static TDEIconLoader *iconLoader(); + ++#ifdef __TDE_HAVE_TDEHWLIB + /** + * Returns a TDEHardwareDevices object. + * @return the global hardware devices object +@@ -90,6 +93,7 @@ public: + * @return the global network manager object + */ + static TDEGlobalNetworkManager *networkManager(); ++#endif + + /** + * Returns the global locale object. diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 60f270eee..a65a417ca 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -27,6 +27,7 @@ %define tde_pkg tdelibs %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin +%define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc %define tde_includedir %{tde_prefix}/include @@ -63,7 +64,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc -Patch0: %{tde_pkg}-%{tde_version}.patch + +Patch0: tdelibs-14.0.1.patch Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} @@ -124,6 +126,9 @@ BuildRequires: libtiff-devel # OPENSSL support BuildRequires: openssl-devel +# ACL support +BuildRequires: libacl-devel + # GLIB2 support BuildRequires: glib2-devel @@ -314,6 +319,9 @@ Requires: %{cacert} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %define xt_devel libXt-devel %endif +%if 0%{?mgaversion} || 0%{?mdkversion} +%define xt_devel libxt-devel +%endif %{?xt_devel:BuildRequires: %{xt_devel}} ### New features in TDE R14 @@ -470,7 +478,6 @@ kimgio (image manipulation). %{tde_datadir}/applnk/tdeio_iso.desktop %{tde_datadir}/apps/* %exclude %{tde_datadir}/apps/ksgmltools2/ -%{tde_datadir}/config/* %{tde_datadir}/emoticons/* %{tde_datadir}/icons/crystalsvg/ %{tde_datadir}/icons/default.tde @@ -482,6 +489,9 @@ kimgio (image manipulation). %{tde_tdedocdir}/HTML/en/common/* %{tde_tdedocdir}/HTML/en/tdespell/ +# Global Trinity configuration +%config %{tde_confdir} + # Some setuid binaries need special care %if 0%{?suse_version} %verify(not mode) %{tde_bindir}/kgrantpty @@ -578,6 +588,13 @@ applications for TDE. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %patch0 -p1 -b .ftbfs +# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings +%if 0%{?rhel} == 5 +%__sed -i "tdecore/kinstance.h" \ + -i "tdecore/tdeglobal.h" \ + -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d" +%endif + %build unset QTDIR QTINC QTLIB @@ -607,6 +624,7 @@ fi \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ -DDOC_INSTALL_DIR="%{tde_docdir}" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ @@ -698,5 +716,5 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit" %changelog -* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial release for TDE 14.0.0 +* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1 +- Initial release for TDE 14.0.1 diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.spec b/redhat/main/tdelibs/tdelibs-14.0.1.spec deleted file mode 100644 index 6ff6e3a12..000000000 --- a/redhat/main/tdelibs/tdelibs-14.0.1.spec +++ /dev/null @@ -1,704 +0,0 @@ -# -# spec file for package tdelibs (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.1 -%endif -%define tde_pkg tdelibs -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_confdir %{_sysconfdir}/trinity -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_tdeappdir %{tde_datadir}/applications/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - - -Name: trinity-%{tde_pkg} -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: TDE Libraries -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: %{name}-rpmlintrc - -Obsoletes: tdelibs < %{version}-%{release} -Provides: tdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs < %{version}-%{release} -Provides: trinity-kdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} -Provides: trinity-kdelibs-apidocs = %{version}-%{release} - -# for set_permissions macro -%if 0%{?suse_version} -PreReq: permissions -%endif - -# Trinity dependencies -BuildRequires: libtqt4-devel = %{tde_epoch}:4.2.0 -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 -BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -BuildRequires: trinity-filesystem >= %{tde_version} - -Requires: trinity-arts >= %{tde_epoch}:1.5.10 -Requires: trinity-filesystem >= %{tde_version} -Requires: fileshareset >= 2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: fdupes - -# SUSE desktop files utility -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%if 0%{?opensuse_bs} && 0%{?suse_version} -# for xdg-menu script -BuildRequires: brp-check-trinity -%endif - -# KRB5 support -BuildRequires: krb5-devel - -# XSLT support -BuildRequires: libxslt-devel - -# ALSA support -BuildRequires: alsa-lib-devel - -# IDN support -BuildRequires: libidn-devel - -# CUPS support -BuildRequires: cups-devel - -# TIFF support -BuildRequires: libtiff-devel - -# OPENSSL support -BuildRequires: openssl-devel - -# GLIB2 support -BuildRequires: glib2-devel - -# LUA support are not ready yet -#BuildRequires: lua-devel - -# LIBART_LGPL support -BuildRequires: libart_lgpl-devel - -# ASPELL support -BuildRequires: aspell -BuildRequires: aspell-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_pcre 1 -BuildRequires: pcre-devel -%endif - -# INOTIFY support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_inotify 1 -%endif - -# BZIP2 support -%if 0%{?suse_version} -BuildRequires: libbz2-devel -%else -BuildRequires: bzip2-devel -%endif - -# UTEMPTER support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}utempter-devel -%endif -%if 0%{?rhel} >=5 || 0%{?fedora} -BuildRequires: libutempter-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: utempter -%endif -%if 0%{?suse_version} -BuildRequires: utempter-devel -%endif - -# HSPELL support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_hspell 1 -BuildRequires: hspell-devel -%endif - -# JASPER support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_jasper 1 -%if 0%{?suse_version} -BuildRequires: libjasper-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jasper-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: jasper-devel -%endif -%endif - -# AVAHI support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_avahi 1 -BuildRequires: libavahi-tqt-devel >= 1:0.6.30 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}avahi-client-devel -Requires: %{_lib}avahi-client3 -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: avahi-devel -Requires: avahi -%endif -%endif - -# OPENEXR support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_openexr 1 -BuildRequires: OpenEXR-devel -%endif - -# LIBTOOL -BuildRequires: libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -# X11 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: x11-proto-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: xorg-x11-proto-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif - -# ICEAUTH -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -Requires: iceauth -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -Requires: xorg-x11-server-utils -%endif -%if 0%{?rhel} == 4 || 0%{?suse_version} -Requires: xorg-x11 -%endif - -# XZ support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -%define with_lzma 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}lzma-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: xz-devel -%endif -%endif - -# Certificates support -%if 0%{?fedora} || 0%{?rhel} >= 6 -BuildRequires: ca-certificates -Requires: ca-certificates -%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6 -%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt -%endif -%if 0%{?fedora} == 18 || 0%{?fedora} == 19 -%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt -%endif -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -Requires: rootcerts -%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt -%else -%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt -Requires: openssl -%endif -%endif -%if 0%{?rhel} == 5 -%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt -Requires: openssl -%endif -%if 0%{?suse_version} -%define cacert %{_sysconfdir}/ssl/ca-bundle.pem -BuildRequires: ca-certificates -Requires: ca-certificates -%endif -%if "%{cacert}" != "" -Requires: %{cacert} -%endif - -# XRANDR support -# On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define with_xrandr 1 -%endif - -# XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -%define xcomposite_devel %{_lib}xcomposite-devel -%else -%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -%define xcomposite_devel libXcomposite-devel -%endif -%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}} - -# XT support -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%define xt_devel libXt-devel -%endif -%{?xt_devel:BuildRequires: %{xt_devel}} - -### New features in TDE R14 - -# LIBMAGIC support -%if 0%{?rhel} == 5 -BuildRequires: file -%else -BuildRequires: file-devel -%endif - -# NETWORKMANAGER support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} -%define with_nm 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}nm-util-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: NetworkManager-glib-devel -%endif -%if 0%{?suse_version} -BuildRequires: NetworkManager-devel -%endif -%endif - -# UDEV support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 -%define with_tdehwlib 1 -BuildRequires: libudev-devel -%endif - -# HAL support -%if 0%{?rhel} == 5 -%define with_hal 1 -%endif - -# UDISKS support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 -%if 0%{?pclinuxos} == 0 -%define with_udisks 1 -BuildRequires: udisks-devel -Requires: udisks -%endif -%endif - -# PMOUNT support -#Requires: pmount - -# UDISKS2 support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 -%define with_udisks2 1 -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -BuildRequires: libudisks2-devel -%else -BuildRequires: udisks2-devel -%endif -Requires: udisks2 -%endif - -# DEVICEKIT POWER support -%if 0%{?rhel} == 6 -%define with_devkitpower 1 -Requires: DeviceKit-power -%endif - -# UPOWER support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 -%define with_upower 1 -Requires: upower -%endif - -# SYSTEMD support -%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7 -%define with_systemd 1 -%endif - - -%description -Libraries for the Trinity Desktop Environment: -TDE Libraries included: tdecore (TDE core library), tdeui (user interface), -kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking), -kspell (spelling checker), jscript (javascript), kab (addressbook), -kimgio (image manipulation). - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO -%{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}/imagetops -%{tde_bindir}/tdeab2tdeabc -%{tde_bindir}/kaddprinterwizard -%{tde_bindir}/tdebuildsycoca -%{tde_bindir}/tdecmshell -%{tde_bindir}/tdeconf_update -%{tde_bindir}/kcookiejar -%{tde_bindir}/tde-config -%{tde_bindir}/tde-menu -%{tde_bindir}/kded -%{tde_bindir}/tdeinit -%{tde_bindir}/tdeinit_shutdown -%{tde_bindir}/tdeinit_wrapper -%{tde_bindir}/tdesu_stub -%{tde_bindir}/kdetcompmgr -%{tde_bindir}/kdontchangethehostname -%{tde_bindir}/tdedostartupconfig -%{tde_bindir}/tdefile -%{tde_bindir}/kfmexec -%{tde_bindir}/tdehotnewstuff -%{tde_bindir}/kinstalltheme -%{tde_bindir}/tdeio_http_cache_cleaner -%{tde_bindir}/tdeio_uiserver -%{tde_bindir}/tdeioexec -%{tde_bindir}/tdeioslave -%{tde_bindir}/tdeiso_info -%{tde_bindir}/tdelauncher -%if 0%{?with_elficon} -%{tde_bindir}/tdelfeditor -%endif -%{tde_bindir}/tdemailservice -%{tde_bindir}/tdemimelist -%{tde_bindir}/tdesendbugmail -%{tde_bindir}/kshell -%{tde_bindir}/tdestartupconfig -%{tde_bindir}/tdetelnetservice -%{tde_bindir}/tdetradertest -%{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_tdeinit_wrapper -%{tde_bindir}/checkXML -%{tde_bindir}/ksvgtopng -%{tde_bindir}/tdeunittestmodrunner -%{tde_bindir}/preparetips -%{tde_tdelibdir}/* -%{tde_libdir}/lib*.so.* -%{tde_libdir}/libtdeinit_*.la -%{tde_libdir}/libtdeinit_*.so -%{tde_datadir}/applications/tde/*.desktop -%{tde_datadir}/autostart/tdeab2tdeabc.desktop -%{tde_datadir}/applnk/tdeio_iso.desktop -%{tde_datadir}/apps/* -%exclude %{tde_datadir}/apps/ksgmltools2/ -%{tde_datadir}/emoticons/* -%{tde_datadir}/icons/crystalsvg/ -%{tde_datadir}/icons/default.tde -%{tde_datadir}/icons/hicolor/index.theme -%{tde_datadir}/locale/all_languages -%{tde_datadir}/mimelnk/*/*.desktop -%{tde_datadir}/services/* -%{tde_datadir}/servicetypes/* -%{tde_tdedocdir}/HTML/en/common/* -%{tde_tdedocdir}/HTML/en/tdespell/ - -# Global Trinity configuration -%config %{tde_confdir} - -# Some setuid binaries need special care -%if 0%{?suse_version} -%verify(not mode) %{tde_bindir}/kgrantpty -%verify(not mode) %{tde_bindir}/kpac_dhcp_helper -%verify(not mode) %{tde_bindir}/start_tdeinit -%else -%attr(4755,root,root) %{tde_bindir}/kgrantpty -%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper -%attr(4711,root,root) %{tde_bindir}/start_tdeinit -%endif - -%config %{_sysconfdir}/xdg/menus/tde-applications.menu -%config %{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde - -# DBUS stuff, related to TDE hwlib -%if 0%{?with_tdehwlib} -%{tde_bindir}/tde_dbus_hardwarecontrol -%config %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf -%{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service -%endif - -%pre -# TDE Bug #1074 -if [ -d "%{tde_datadir}/locale/all_languages" ]; then - rm -rf "%{tde_datadir}/locale/all_languages" -fi - -%post -/sbin/ldconfig || : - -%if 0%{?suse_version} -# Sets permissions on setuid files (openSUSE specific) -%set_permissions %{tde_bindir}/kgrantpty -%set_permissions %{tde_bindir}/kpac_dhcp_helper -%set_permissions %{tde_bindir}/start_tdeinit -%endif - -%postun -/sbin/ldconfig || : - -########## - -%package devel -Summary: TDE Libraries (Development files) -Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} - -Obsoletes: tdelibs-devel < %{version}-%{release} -Provides: tdelibs-devel = %{version}-%{release} -Obsoletes: trinity-kdelibs-devel < %{version}-%{release} -Provides: trinity-kdelibs-devel = %{version}-%{release} - -Requires: libtqt3-mt-devel >= 3.5.0 -Requires: libtqt4-devel = %{tde_epoch}:4.2.0 -Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -Requires: libart_lgpl-devel -%{?xcomposite_devel:Requires: %{xcomposite_devel}} -%{?xt_devel:Requires: %{xt_devel}} - -%description devel -This package includes the header files you will need to compile -applications for TDE. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/dcopidl* -%{tde_bindir}/*config_compiler -%{tde_bindir}/maketdewidgets -%{tde_datadir}/apps/ksgmltools2/ -%{tde_tdeincludedir}/* -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/*.a -%exclude %{tde_libdir}/libtdeinit_*.la -%exclude %{tde_libdir}/libtdeinit_*.so -%{tde_datadir}/cmake/tdelibs.cmake -%{tde_libdir}/pkgconfig/tdelibs.pc - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include" -fi - -export TDEDIR="%{tde_prefix}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=ON \ - \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - \ - -DWITH_ALL_OPTIONS=ON \ - -DWITH_ARTS=ON \ - -DWITH_ALSA=ON \ - -DWITH_LIBART=ON \ - -DWITH_LIBIDN=ON \ - -DWITH_SSL=ON \ - -DWITH_CUPS=ON \ - -DWITH_LUA=OFF \ - -DWITH_TIFF=ON \ - %{?!with_jasper:-DWITH_JASPER=OFF} \ - %{?!with_openexr:-DWITH_OPENEXR=OFF} \ - -DWITH_UTEMPTER=ON \ - %{?!with_elficon:-DWITH_ELFICON=OFF} \ - %{?!with_avahi:-DWITH_AVAHI=OFF} \ - %{?!with_pcre:-DWITH_PCRE=OFF} \ - %{?!with_inotify:-DWITH_INOTIFY=OFF} \ - %{?!with_gamin:-DWITH_GAMIN=OFF} \ - %{?!with_tdehwlib:-DWITH_TDEHWLIB=OFF} \ - %{?!with_tdehwlib:-DWITH_TDEHWLIB_DAEMONS=OFF} \ - %{?with_hal:-DWITH_HAL=ON} \ - %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \ - %{?with_systemd:-DWITH_LOGINDPOWER=ON} \ - %{?!with_upower:-DWITH_UPOWER=OFF} \ - %{?!with_udisks:-DWITH_UDISKS=OFF} \ - %{?!with_udisks2:-DWITH_UDISKS2=OFF} \ - -DWITH_CONSOLEKIT=ON \ - %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \ - -DWITH_SUDO_TDESU_BACKEND=OFF \ - -DWITH_OLD_XDG_STD=OFF \ - %{?!with_lzma:-DWITH_LZMA=OFF} \ - -DWITH_LIBBFD=OFF \ - %{?!with_xrandr:-DWITH_XRANDR=OFF} \ - -DWITH_XCOMPOSITE=ON \ - -DWITH_KDE4_MENU_SUFFIX=OFF \ - \ - -DWITH_ASPELL=ON \ - %{?!with_hspell:-DWITH_HSPELL=OFF} \ - -DWITH_TDEICONLOADER_DEBUG=OFF \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf "%{?buildroot}" -%__make install DESTDIR="%{?buildroot}" -C build - -# Use system-wide CA certificates -%if "%{?cacert}" != "" -%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" -%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" -%endif - -# Symlinks duplicate files (mostly under 'ksgmltools2') -%fdupes -s "%{?buildroot}" - -# Fix 'tderesources.desktop' (openSUSE only) -%if 0%{?suse_version} -%suse_update_desktop_file -r tderesources Qt X-TDE-settings-desktop -%endif - -# Remove setuid bit on some binaries. -chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty" -chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper" -chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit" - -# fileshareset 2.0 is provided separately. -# Remove integrated fileshareset 1.0 . -%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist" -%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset" - - -%clean -%__rm -rf "%{?buildroot}" - -%if 0%{?suse_version} -# Check permissions on setuid files (openSUSE specific) -%verifyscript -%verify_permissions -e %{tde_bindir}/kgrantpty -%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper -%verify_permissions -e %{tde_bindir}/start_tdeinit -%endif - - -%changelog -* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1 -- Initial release for TDE 14.0.1 |