diff options
| -rw-r--r-- | redhat/applications/kpilot/kpilot-14.0.0.spec | 6 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 1 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 18 | ||||
| -rw-r--r-- | redhat/tdewebdev/tdewebdev-14.0.0.spec | 6 |
5 files changed, 34 insertions, 5 deletions
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index cf3f4dd3e..801b4b89f 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -48,7 +48,13 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +# FLEX +%if 0%{?suse_version} +BuildRequires: flex +%else BuildRequires: flex-devel +%endif + BuildRequires: gettext BuildRequires: pilot-link-devel >= 0.12 BuildRequires: trinity-tdepim-devel >= %{tde_version} diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 63a196166..f60190970 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -34,6 +34,7 @@ if [ -n "${DEVEL}" ]; then # Applications do NOT have development packages, except K3B case "${PKGCATEGORY}" in "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;; + "extras") if [ "${PKGNAME}" != "akode" ]; then exit 0; fi;; esac # Other packags NOT having development package case "${PKGNAME}" in diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 1cf3e4bd5..e273c4006 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -49,7 +49,7 @@ BuildRequires: cups-devel # GLIB2 support %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6 -%define with_glibmainloop 1 +hdefine with_glibmainloop 1 BuildRequires: glib2-devel %endif @@ -481,7 +481,7 @@ for the TQt 3 toolkit. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs +#patch1 -p1 -b .ftbfs %endif %patch15 -p1 -b .tqthomedir @@ -512,6 +512,10 @@ export PATH=${QTDIR}/bin:${PATH} export MANPATH=${QTDIR}/doc/man:${MANPATH} export LD_LIBRARY_PATH="${QTDIR}/lib" +%if 0%{?rhel} == 5 +%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|" +%endif + # Checks for supplementary include dir INCDIRS="" for d in \ diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index f2d03d1ca..cf2e05165 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -39,11 +39,18 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz #Patch11: tdelibs-14.0.0-displayconfig_crash.patch # Patches from Mandriva -Patch102: tdelibs-14.0.0-cups_by_default.patch +Patch101: tdelibs-14.0.0-cups_by_default.patch +Patch102: tdelibs-14.0.0-fix_kurlbar_global.patch +Patch103: tdelibs-14.0.0-fix_enable_kdialogbox.patch +Patch104: tdelibs-14.0.0-fix_https_loop.patch +Patch105: tdelibs-14.0.0-tdeio_file_grouplist.patch +Patch107: tdelibs-14.0.0-karchive_assert.patch +Patch108: tdelibs-14.0.0-tdeabc_add_postofficebox.patch # Enables the 'kddebug' feature even when built with '-DNDEBUG' #Patch201: tdelibs-14.0.0-enable_kddebug.patch + Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} Obsoletes: trinity-kdelibs < %{version}-%{release} @@ -460,7 +467,13 @@ applications for TDE. #patch11 -p1 -b .displayconfigcrash -%patch102 -p1 -b .cups_by_default +%patch101 -p1 -b .cups_by_default +%patch102 -p0 -b .kurl +%patch103 -p0 -b .kdialogbox +%patch104 -p0 -b .httpsloop +%patch105 -p0 -b .tdeiofilegrouplist +%patch107 -p0 -b .karchiveassert +%patch108 -p0 -b .tdeabc #patch201 -p1 -b .kddebug @@ -469,6 +482,7 @@ applications for TDE. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export TDEDIR="%{tde_prefix}" if ! rpm -E %%cmake|grep -q "cd build"; then %__mkdir_p build diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec index 1237d4193..f4669ed29 100644 --- a/redhat/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec @@ -41,6 +41,7 @@ Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2 Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2 Source5: hi48-app-kxsldbg.png +Patch0: tdewebdev-14.0.0-ftbfs.patch Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch BuildRequires: autoconf automake libtool m4 @@ -490,7 +491,9 @@ Requires: trinity-kommander-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4 +%patch0 -p1 -b .ftbfs %patch1 -p1 -b .kxsldbg-icons +rm -rf lib/compatibility %__install -m644 -p %{SOURCE5} kxsldbg/ %if 0%{?build_kxsldbg} == 0 @@ -529,7 +532,8 @@ fi --enable-rpath \ --disable-gcc-hidden-visibility \ \ - --enable-editors + --enable-editors \ + --with-extra-includes=%{_includedir}/tqt # WTF hack for RHEL4 |