summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2.spec8
-rw-r--r--redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch2
-rw-r--r--redhat/applications/katapult/katapult-3.5.13.2.spec2
-rw-r--r--redhat/applications/kmymoney/admin-fix-parallel-test.diff11
-rw-r--r--redhat/applications/kmymoney/kmymoney-3.5.13.2.spec8
-rw-r--r--redhat/applications/koffice/admin-fix-parallel-test.diff11
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch15
-rw-r--r--redhat/applications/koffice/koffice-3.5.13.2.spec12
-rw-r--r--redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec9
-rw-r--r--redhat/applications/ktorrent/ktorrent-3.5.13.2.spec2
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.2.spec2
-rw-r--r--redhat/applications/piklab/piklab-3.5.13.2.spec8
-rw-r--r--redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec18
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch33
-rw-r--r--redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec2
15 files changed, 109 insertions, 34 deletions
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index b176dc85b..3e3b1578c 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -71,7 +71,13 @@ Requires(postun): coreutils
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: cdrecord mkisofs
+%if 0%{?suse_version} >= 1310
+Requires: wodim
+REquires: genisoimage
+%else
+Requires: cdrecord
+REquires: mkisofs
+%endif
Requires: dvd+rw-tools
# CDRDAO support
diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
index 9fe3142a1..f6a362d40 100644
--- a/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
+++ b/redhat/applications/k9copy/k9copy-3.5.13.2-avcodec.patch
@@ -4,7 +4,7 @@
#else
typedef int (*av_find_stream_info_t)(AVFormatContext *);
#endif
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 26, 0)
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0)
+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
+#else
typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec
index b34f34144..20afee2a5 100644
--- a/redhat/applications/katapult/katapult-3.5.13.2.spec
+++ b/redhat/applications/katapult/katapult-3.5.13.2.spec
@@ -195,7 +195,7 @@ update-desktop-database %{tde_appdir} &> /dev/null
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-2
- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
+* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.3.2.1-1
- Initial release for RHEL 6.0
- Import to GIT
diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/applications/kmymoney/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+
+ if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
index 972e753e9..a7ccc0a4d 100644
--- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec
@@ -59,6 +59,9 @@ Source1: kmymoneytitlelabel.png
# [kmymoney] Fix FTBFS
Patch1: kmymoney-3.5.13.2-ftbfs.patch
+# [admin] Fix automake 1.13 build issue
+Patch2: admin-fix-parallel-test.diff
+
# [kmymoney] Missing LDFLAGS causing FTBFS
Patch4: kmymoney-3.5.13-missing_ldflags.patch
@@ -126,14 +129,11 @@ This package contains development files needed for KMyMoney plugins.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .automake113
%if 0%{?mgaversion} || 0%{?mdkversion}
%patch5 -p1 -b .qtpluginsdir
%endif
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
-
%__install -m644 %{SOURCE1} kmymoney2/widgets/
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
diff --git a/redhat/applications/koffice/admin-fix-parallel-test.diff b/redhat/applications/koffice/admin-fix-parallel-test.diff
new file mode 100644
index 000000000..9f6f46ba8
--- /dev/null
+++ b/redhat/applications/koffice/admin-fix-parallel-test.diff
@@ -0,0 +1,11 @@
+--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200
++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200
+@@ -123,7 +123,7 @@
+ fi
+
+ echo "*** Creating Makefile templates"
+-$AUTOMAKE || exit 1
++$AUTOMAKE --add-missing || exit 1
+
+ if test "$UNSERMAKE" = no; then
+ echo "*** Postprocessing Makefile templates"
diff --git a/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
new file mode 100644
index 000000000..f375078cf
--- /dev/null
+++ b/redhat/applications/koffice/koffice-3.5.13.2-fix_ruby2_detection.patch
@@ -0,0 +1,15 @@
+--- trinity-koffice-3.5.13.2/lib/kross/configure.in.in.ori 2013-08-24 20:57:39.878623151 +0200
++++ trinity-koffice-3.5.13.2/lib/kross/configure.in.in 2013-08-24 20:58:50.132123615 +0200
+@@ -42,6 +42,12 @@
+ fi
+ fi
+ if test -z "$RUBY_VERSION"; then
++ RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null`
++ if test -n "$RUBY_VERSION"; then
++ RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags`
++ fi
++ fi
++ if test -z "$RUBY_VERSION"; then
+ # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
+ if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
+ # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1
diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec
index 5e23a4fe8..34dfb6606 100644
--- a/redhat/applications/koffice/koffice-3.5.13.2.spec
+++ b/redhat/applications/koffice/koffice-3.5.13.2.spec
@@ -27,7 +27,7 @@
%define _docdir %{tde_docdir}
# Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_kross 1
%endif
@@ -56,6 +56,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch1: koffice-3.5.13.2-fix_kformula_ftbfs.patch
+Patch2: koffice-3.5.13.2-fix_ruby2_detection.patch
+Patch3: admin-fix-parallel-test.diff
# BuildRequires: world-devel ;)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@@ -1061,10 +1063,8 @@ This package is part of the TDE Office Suite.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs
-
-%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19
-%__cp /usr/share/automake-1.13/test-driver admin/
-%endif
+%patch2 -p1 -b .ruby2
+%patch3 -p1 -b .automake113
# use LGC variant instead
%__sed -i.dejavu-lgc \
@@ -1078,7 +1078,7 @@ This package is part of the TDE Office Suite.
%build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export KDEDIR="%{tde_prefix}"
diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
index 74b353a6e..f90d74100 100644
--- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
+++ b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec
@@ -1,3 +1,5 @@
+# openSUSE 12.3: do NOT install libotr-devel, use libotr2-devel instead !
+
# Default version for this component
%define tde_pkg kopete-otr
%define tde_version 3.5.13.2
@@ -82,8 +84,9 @@ users with IM-Cients supporting the OTR encryption method.
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
+export
%configure \
--prefix=%{tde_prefix} \
@@ -99,7 +102,9 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --enable-rpath
+ --enable-rpath \
+ \
+ --with-extra-includes=/usr/include/tqt
%__make %{_smp_mflags}
diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
index b4c76217d..5324722a6 100644
--- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
+++ b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec
@@ -52,7 +52,7 @@ BuildRequires: gettext
# AVAHI support
# Disabled on RHEL4 and RHEL5
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_avahi 1
BuildRequires: trinity-avahi-tqt-devel
Requires: trinity-avahi-tqt
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
index 9e08d202f..b34d3ca68 100644
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec
@@ -151,7 +151,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
+* Wed Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
- Import to GIT
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec
index b8866b682..a44e1fd82 100644
--- a/redhat/applications/piklab/piklab-3.5.13.2.spec
+++ b/redhat/applications/piklab/piklab-3.5.13.2.spec
@@ -78,6 +78,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-final causes FTBFS
+# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@@ -92,7 +93,10 @@ export PATH="%{tde_bindir}:${PATH}"
--disable-final \
--enable-new-ldflags \
--enable-closure \
- --enable-rpath
+ --enable-rpath \
+%if 0%{?rhel} == 5
+ --disable-libreadline \
+%endif
%__make %{?_smp_mflags}
@@ -153,7 +157,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
- Initial release for TDE 3.5.13.1
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
+* Fri Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
- Fix MAN directory location
- Fix compilation with GCC 4.7 [Bug #958]
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
index df4779921..19df57c69 100644
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
@@ -78,18 +78,8 @@ BuildRequires: sip-devel
%endif
# PYTHON-QT support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: python-qt
-Requires: python-qt
-%endif
-%if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: trinity-PyQt-devel
-Requires: trinity-PyQt
-%endif
-%if 0%{?rhel} >= 6 || 0%{?fedora}
-BuildRequires: PyQt-devel
-Requires: PyQt
-%endif
+BuildRequires: python-qt3-devel
+Requires: python-qt3
Requires: trinity-python-trinity
Requires: trinity-pytdeextensions
@@ -282,7 +272,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
export KDEDIR=%{tde_prefix}
# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia
@@ -306,7 +296,7 @@ export PATH="%{tde_bindir}:${PATH}"
export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
# For RHEL4 only
-export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled.
export PYTHONDONTWRITEBYTECODE=
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
new file mode 100644
index 000000000..b83b3f3ad
--- /dev/null
+++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
@@ -0,0 +1,33 @@
+--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200
++++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200
+@@ -143,10 +143,10 @@
+ */
+
+ static const TQString
+- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
++ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
+ "<table class=\"query\">\n");
+ static const TQString
+- html_form_end("<tr>\n"
++ html_form_end_apt("<tr>\n"
+ "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
+ "</tr>\n"
+ "</table>\n"
+@@ -197,7 +197,7 @@
+ if (online)
+ stream << "<table class=\"queryform\"><tr><td>\n";
+
+- stream << html_form_begin;
++ stream << html_form_begin_apt;
+ stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
+ stream << make_html_form_line("search", i18n("Package search"));
+ if (ext_form)
+@@ -206,7 +206,7 @@
+ stream << make_html_form_line("fsearch", i18n("File search"));
+ stream << make_html_form_line("show", i18n("Package info"));
+ }
+- stream << html_form_end.arg( i18n("Search") );
++ stream << html_form_end_apt.arg( i18n("Search") );
+
+ if (online)
+ {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
index 79429ac17..316566375 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
@@ -41,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch1: tdeio-apt-14.0.0-ftbfs.patch
+Patch1: tdeio-apt-3.5.13.2-ftbfs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-27 19:28:38 +0000