summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec19
-rw-r--r--redhat/kdeadmin/bp004-1f719050.diff32
-rw-r--r--redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch336
-rw-r--r--redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec28
-rw-r--r--redhat/kdegames/trinity-kdegames-3.5.13.spec16
-rw-r--r--redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec2
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec6
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch19
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch49
-rw-r--r--redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec24
-rw-r--r--redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec5
-rw-r--r--redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch21
-rw-r--r--redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch20
-rw-r--r--redhat/kdepim/trinity-kdepim-3.5.13.spec14
-rwxr-xr-xredhat/kdeutils/trinity-kdeutils-3.5.13.spec11
-rw-r--r--redhat/kdevelop/c_cpp_reference-2.0.2-install.patch9
-rw-r--r--redhat/kdevelop/trinity-kdevelop-3.5.13.spec9
-rw-r--r--redhat/libraries/libkipi/trinity-libkipi.spec9
-rw-r--r--redhat/libraries/libksquirrel/trinity-libksquirrel.spec15
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch33
-rw-r--r--redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch4
-rw-r--r--redhat/libraries/python-trinity/python-trinity.spec16
l---------redhat/main1
l---------redhat/tdebase1
24 files changed, 472 insertions, 227 deletions
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index 3650c8332..acf01c9bd 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -2,12 +2,12 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 3
+%define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -36,8 +36,6 @@ Source0: kdeaddons-%{version}.tar.gz
Source1: metabar-fedora.tar.bz2
Source2: metabarrc
-Patch3: kdeaddons-3.5.3-sdl.patch
-
BuildRequires: trinity-kdebase-devel
BuildRequires: trinity-kdegames-devel
BuildRequires: trinity-kdemultimedia-devel
@@ -83,16 +81,14 @@ This package includes:
%prep
%setup -q -a 1 -n kdeaddons
-%patch3 -p1 -b .sdl
-
# 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" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -247,6 +243,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
+* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Removes SDL patch for noatun
+
* Thu Dec 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Fix content of -extras package
- Fix various packaging issues
diff --git a/redhat/kdeadmin/bp004-1f719050.diff b/redhat/kdeadmin/bp004-1f719050.diff
new file mode 100644
index 000000000..97e90ba30
--- /dev/null
+++ b/redhat/kdeadmin/bp004-1f719050.diff
@@ -0,0 +1,32 @@
+commit 1f71905047d874cdc6c63049e566a4d7b976b0fc
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1327530712 -0600
+
+ Fix linear alphabet string errors
+
+diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp
+index e470a72..f5cb04c 100644
+--- a/kcron/ctcron.cpp
++++ b/kcron/ctcron.cpp
+@@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron)
+ if ((line.find("#") == 0) && (line.find("\\") != 1))
+ {
+ // If the first 10 characters don't contain a character, it's probably a disabled entry.
+- int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ");
++ int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+ if (first_text < 0)
+ continue;
+
+diff --git a/kuser/misc.cpp b/kuser/misc.cpp
+index 6b26a72..c16f563 100644
+--- a/kuser/misc.cpp
++++ b/kuser/misc.cpp
+@@ -135,7 +135,7 @@ void addShell(const TQString &shell)
+ TQCString genSalt( int len )
+ {
+ TQCString salt( len + 1 );
+- const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ0123456789./";
++ const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
+
+ salt[0] = set[getpid() % strlen(set)];
+ for( int i = 1; i < len; i++ ) {
diff --git a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch
index 2ce36a0e2..9ba0d0d99 100644
--- a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch
+++ b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch
@@ -1,6 +1,158 @@
-diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetworkconf/backends/network-conf.in
---- kdeadmin.ORI/knetworkconf/backends/network-conf.in 2012-01-11 20:15:15.161715402 +0100
-+++ kdeadmin.P/knetworkconf/backends/network-conf.in 2012-01-11 20:39:21.746715574 +0100
+--- kdeadmin/knetworkconf/backends/service.pl.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200
++++ kdeadmin/knetworkconf/backends/service.pl.in 2012-05-03 11:09:05.093902723 +0200
+@@ -59,6 +59,9 @@
+ "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++
++ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+
+ "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+@@ -110,6 +113,10 @@
+ "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+
++ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++ "fedora-17" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
++
+ "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+@@ -139,6 +146,9 @@
+ "redhat-9" => [3, 5],
+ "openna-1.0" => [3, 5],
+
++ "rhel-5" => [3, 5],
++ "rhel-6" => [3, 5],
++
+ "mandrake-7.1" => [3, 5],
+ "mandrake-7.2" => [3, 5],
+ "mandrake-9.0" => [3, 5],
+@@ -189,6 +199,10 @@
+ "fedora-4" => [3, 5],
+ "fedora-5" => [3, 5],
+ "rpath" => [3, 5],
++
++ "fedora-15" => [3, 5],
++ "fedora-16" => [3, 5],
++ "fedora-17" => [3, 5],
+
+ "vine-3.0" => [3, 5],
+ "vine-3.1" => [3, 5],
+@@ -218,6 +232,9 @@
+ "redhat-9" => "redhat-5.2",
+ "openna-1.0" => "redhat-5.2",
+
++ "rhel-5" => "redhat-5.2",
++ "rhel-6" => "redhat-5.2",
++
+ "mandrake-7.1" => "redhat-5.2",
+ "mandrake-7.2" => "redhat-5.2",
+ "mandrake-9.0" => "redhat-5.2",
+@@ -267,6 +284,10 @@
+ "fedora-5" => "redhat-5.2",
+ "rpath" => "redhat-5.2",
+
++ "fedora-15" => "redhat-5.2",
++ "fedora-16" => "redhat-5.2",
++ "fedora-17" => "redhat-5.2",
++
+ "vine-3.0" => "redhat-5.2",
+ "vine-3.1" => "redhat-5.2",
+ "ark" => "redhat-5.2",
+@@ -1744,12 +1765,17 @@
+ "redhat-7.3" => \&gst_service_redhat_get_status,
+ "redhat-8.0" => \&gst_service_redhat_get_status,
+ "redhat-9" => \&gst_service_redhat_get_status,
++ "rhel-5" => \&gst_service_redhat_get_status,
++ "rhel-6" => \&gst_service_redhat_get_status,
+ "mandrake-7.2" => \&gst_service_redhat_get_status,
+ "fedora-1" => \&gst_service_redhat_get_status,
+ "fedora-2" => \&gst_service_redhat_get_status,
+ "fedora-3" => \&gst_service_redhat_get_status,
+ "fedora-4" => \&gst_service_redhat_get_status,
+ "fedora-5" => \&gst_service_redhat_get_status,
++ "fedora-15" => \&gst_service_redhat_get_status,
++ "fedora-16" => \&gst_service_redhat_get_status,
++ "fedora-17" => \&gst_service_redhat_get_status,
+
+ "rpath" => \&gst_service_redhat_get_status,
+
+--- kdeadmin/knetworkconf/backends/platform.pl.in.knetworkconf 2011-10-19 07:30:39.000000000 +0200
++++ kdeadmin/knetworkconf/backends/platform.pl.in 2012-05-03 11:07:51.399862363 +0200
+@@ -71,6 +71,8 @@
+ "redhat-7.3" => "Red Hat Linux 7.3 Valhalla",
+ "redhat-8.0" => "Red Hat Linux 8.0 Psyche",
+ "redhat-9" => "Red Hat Linux 9.0 Shrike",
++ "rhel-5" => "Enterprise Linux 5",
++ "rhel-6" => "Enterprise Linux 6",
+ "openna-1.0" => "OpenNA Linux 1.0 VSLC",
+ "mandrake-7.1" => "Linux Mandrake 7.1",
+ "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
+@@ -116,6 +118,9 @@
+ "fedora-3" => "Fedora Core 3 (Heidelberg)",
+ "fedora-4" => "Fedora Core 4 (Stentz)",
+ "fedora-5" => "Fedora Core 5 (Bordeaux)",
++ "fedora-15" => "Fedora 15 (LoveLock)",
++ "fedora-16" => "Fedora 16 (Verne)",
++ "fedora-17" => "Fedora 17 (Beefy Miracle)",
+ "rpath" => "rPath Linux",
+ "ark" => "Ark Linux",
+ };
+@@ -184,6 +189,27 @@
+ return -1;
+ }
+
++sub check_rhel
++{
++ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1;
++ while (<RELEASE>)
++ {
++ chomp;
++ if (
++ (/^CentOS release (\d)([\d\.]+)\s+.*/)
++ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/)
++ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/)
++ )
++ {
++ close RELEASE;
++ return "rhel-$1";
++ }
++ }
++ close RELEASE;
++ return -1;
++}
++
++
+ sub check_openna
+ {
+ open OPENNA, "$gst_prefix/etc/openna-release" or return -1;
+@@ -336,7 +362,10 @@
+ $ver = $_;
+ chomp ($ver);
+
+- if ($ver =~ /^Fedora Core release (\S+)/)
++ if (
++ ($ver =~ /^Fedora Core release (\S+)/)
++ or ($ver =~ /^Fedora release (\S+)/)
++ )
+ {
+ close FEDORA;
+ return "fedora-$1";
+@@ -577,7 +606,7 @@
+ my %check = (
+ # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
+ "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
+- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
++ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
+ \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
+ "FreeBSD" => [ \&check_freebsd ],
+ "SunOS" => [ \&check_solaris ]
+--- kdeadmin/knetworkconf/backends/network-conf.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200
++++ kdeadmin/knetworkconf/backends/network-conf.in 2012-05-03 11:04:14.035793003 +0200
@@ -63,6 +63,7 @@
$version = "@VERSION@";
@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
@@ -14,13 +166,12 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetwor
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
-+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16",
++ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
-diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkconf/backends/network.pl.in
---- kdeadmin.ORI/knetworkconf/backends/network.pl.in 2012-01-11 20:15:15.161715402 +0100
-+++ kdeadmin.P/knetworkconf/backends/network.pl.in 2012-01-11 20:33:43.120340531 +0100
+--- kdeadmin/knetworkconf/backends/network.pl.in.knetworkconf 2011-08-13 08:35:25.000000000 +0200
++++ kdeadmin/knetworkconf/backends/network.pl.in 2012-05-03 11:05:51.621170496 +0200
@@ -492,6 +492,8 @@
"redhat-7.2" => "redhat-6.2",
"redhat-8.0" => "redhat-6.2",
@@ -30,16 +181,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"openna-1.0" => "redhat-6.2",
"debian-2.2" => "debian-2.2",
"debian-3.0" => "debian-2.2",
-@@ -538,6 +540,8 @@
+@@ -538,6 +540,9 @@
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
"fedora-5" => "redhat-6.2",
+ "fedora-15" => "redhat-6.2",
+ "fedora-16" => "redhat-6.2",
++ "fedora-17" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
-@@ -1816,6 +1820,8 @@
+@@ -1816,6 +1821,8 @@
"redhat-7.2" => \&gst_network_rh72_get_file,
"redhat-8.0" => \&gst_network_rh72_get_file,
"redhat-9" => \&gst_network_rh72_get_file,
@@ -48,16 +200,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"openna-1.0" => \&gst_network_rh62_get_file,
"mandrake-7.2" => \&gst_network_rh62_get_file,
"mandrake-7.1" => \&gst_network_rh62_get_file,
-@@ -1863,6 +1869,8 @@
+@@ -1863,6 +1870,9 @@
"fedora-3" => \&gst_network_rh72_get_file,
"fedora-4" => \&gst_network_rh72_get_file,
"fedora-5" => \&gst_network_rh72_get_file,
+ "fedora-15" => \&gst_network_rh72_get_file,
+ "fedora-16" => \&gst_network_rh72_get_file,
++ "fedora-17" => \&gst_network_rh72_get_file,
"rpath" => \&gst_network_rh72_get_file,
"vine-3.0" => \&gst_network_rh62_get_file,
"vine-3.1" => \&gst_network_rh62_get_file,
-@@ -3961,6 +3969,8 @@
+@@ -3961,6 +3971,8 @@
"redhat-7.2" => "lo",
"redhat-8.0" => "lo",
"redhat-9" => "",
@@ -66,16 +219,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"openna-1.0" => "lo",
"mandrake-7.1" => "lo",
"mandrake-7.2" => "lo",
-@@ -4008,6 +4018,8 @@
+@@ -4008,6 +4020,9 @@
"fedora-3" => "",
"fedora-4" => "",
"fedora-5" => "",
+ "fedora-15" => "",
+ "fedora-16" => "",
++ "fedora-17" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
-@@ -4150,6 +4162,8 @@
+@@ -4150,6 +4165,8 @@
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-7.2",
"redhat-9" => "redhat-7.2",
@@ -84,16 +238,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
-@@ -4197,6 +4211,8 @@
+@@ -4197,6 +4214,9 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
++ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
-@@ -4585,6 +4604,8 @@
+@@ -4585,6 +4605,8 @@
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-8.0",
"redhat-9" => "redhat-8.0",
@@ -102,16 +257,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"openna-1.0" => "redhat-6.2",
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
-@@ -4632,6 +4650,8 @@
+@@ -4632,6 +4654,9 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
++ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
-@@ -5445,6 +5465,8 @@
+@@ -5445,6 +5470,8 @@
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-7.2",
"redhat-9" => "redhat-7.2",
@@ -120,16 +276,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.0" => "redhat-7.0",
-@@ -5491,6 +5513,8 @@
+@@ -5491,6 +5518,9 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
++ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
-@@ -5872,6 +5896,8 @@
+@@ -5872,6 +5902,8 @@
"redhat-7.2" => "redhat-7.2",
"redhat-8.0" => "redhat-8.0",
"redhat-9" => "redhat-8.0",
@@ -138,150 +295,13 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc
"mandrake-7.1" => "redhat-6.2",
"mandrake-7.2" => "redhat-6.2",
"mandrake-9.0" => "mandrake-9.0",
-@@ -5918,6 +5944,8 @@
+@@ -5918,6 +5950,9 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-15" => "redhat-7.2",
+ "fedora-16" => "redhat-7.2",
++ "fedora-17" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
-diff -Nuar kdeadmin.ORI/knetworkconf/backends/platform.pl.in kdeadmin.P/knetworkconf/backends/platform.pl.in
---- kdeadmin.ORI/knetworkconf/backends/platform.pl.in 2012-01-11 20:15:15.161715402 +0100
-+++ kdeadmin.P/knetworkconf/backends/platform.pl.in 2012-01-11 20:38:27.401468302 +0100
-@@ -71,6 +71,8 @@
- "redhat-7.3" => "Red Hat Linux 7.3 Valhalla",
- "redhat-8.0" => "Red Hat Linux 8.0 Psyche",
- "redhat-9" => "Red Hat Linux 9.0 Shrike",
-+ "rhel-5" => "Enterprise Linux 5",
-+ "rhel-6" => "Enterprise Linux 6",
- "openna-1.0" => "OpenNA Linux 1.0 VSLC",
- "mandrake-7.1" => "Linux Mandrake 7.1",
- "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
-@@ -116,6 +118,8 @@
- "fedora-3" => "Fedora Core 3 (Heidelberg)",
- "fedora-4" => "Fedora Core 4 (Stentz)",
- "fedora-5" => "Fedora Core 5 (Bordeaux)",
-+ "fedora-15" => "Fedora 15 (LoveLock)",
-+ "fedora-16" => "Fedora 16 (Verne)",
- "rpath" => "rPath Linux",
- "ark" => "Ark Linux",
- };
-@@ -184,6 +188,27 @@
- return -1;
- }
-
-+sub check_rhel
-+{
-+ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1;
-+ while (<RELEASE>)
-+ {
-+ chomp;
-+ if (
-+ (/^CentOS release (\d)([\d\.]+)\s+.*/)
-+ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/)
-+ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/)
-+ )
-+ {
-+ close RELEASE;
-+ return "rhel-$1";
-+ }
-+ }
-+ close RELEASE;
-+ return -1;
-+}
-+
-+
- sub check_openna
- {
- open OPENNA, "$gst_prefix/etc/openna-release" or return -1;
-@@ -577,7 +602,7 @@
- my %check = (
- # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
- "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
-- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
-+ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
- \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
- "FreeBSD" => [ \&check_freebsd ],
- "SunOS" => [ \&check_solaris ]
-diff -Nuar kdeadmin.ORI/knetworkconf/backends/service.pl.in kdeadmin.P/knetworkconf/backends/service.pl.in
---- kdeadmin.ORI/knetworkconf/backends/service.pl.in 2012-01-11 20:15:15.160715344 +0100
-+++ kdeadmin.P/knetworkconf/backends/service.pl.in 2012-01-11 20:21:36.452645160 +0100
-@@ -59,6 +59,9 @@
- "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+
-+ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-
- "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-@@ -110,6 +113,9 @@
- "fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-
-+ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-+
- "vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-@@ -139,6 +145,9 @@
- "redhat-9" => [3, 5],
- "openna-1.0" => [3, 5],
-
-+ "rhel-5" => [3, 5],
-+ "rhel-6" => [3, 5],
-+
- "mandrake-7.1" => [3, 5],
- "mandrake-7.2" => [3, 5],
- "mandrake-9.0" => [3, 5],
-@@ -189,6 +198,9 @@
- "fedora-4" => [3, 5],
- "fedora-5" => [3, 5],
- "rpath" => [3, 5],
-+
-+ "fedora-15" => [3, 5],
-+ "fedora-16" => [3, 5],
-
- "vine-3.0" => [3, 5],
- "vine-3.1" => [3, 5],
-@@ -218,6 +230,9 @@
- "redhat-9" => "redhat-5.2",
- "openna-1.0" => "redhat-5.2",
-
-+ "rhel-5" => "redhat-5.2",
-+ "rhel-6" => "redhat-5.2",
-+
- "mandrake-7.1" => "redhat-5.2",
- "mandrake-7.2" => "redhat-5.2",
- "mandrake-9.0" => "redhat-5.2",
-@@ -267,6 +282,9 @@
- "fedora-5" => "redhat-5.2",
- "rpath" => "redhat-5.2",
-
-+ "fedora-15" => "redhat-5.2",
-+ "fedora-16" => "redhat-5.2",
-+
- "vine-3.0" => "redhat-5.2",
- "vine-3.1" => "redhat-5.2",
- "ark" => "redhat-5.2",
-@@ -1744,12 +1762,16 @@
- "redhat-7.3" => \&gst_service_redhat_get_status,
- "redhat-8.0" => \&gst_service_redhat_get_status,
- "redhat-9" => \&gst_service_redhat_get_status,
-+ "rhel-5" => \&gst_service_redhat_get_status,
-+ "rhel-6" => \&gst_service_redhat_get_status,
- "mandrake-7.2" => \&gst_service_redhat_get_status,
- "fedora-1" => \&gst_service_redhat_get_status,
- "fedora-2" => \&gst_service_redhat_get_status,
- "fedora-3" => \&gst_service_redhat_get_status,
- "fedora-4" => \&gst_service_redhat_get_status,
- "fedora-5" => \&gst_service_redhat_get_status,
-+ "fedora-15" => \&gst_service_redhat_get_status,
-+ "fedora-16" => \&gst_service_redhat_get_status,
-
- "rpath" => \&gst_service_redhat_get_status,
-
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
index dd52c4543..87383392a 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 3
+%define release 4
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -39,8 +39,11 @@ Source5: kpackagerc
Source6: ksysvrc
Source7: kuserrc
-# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16
-Patch0: kdeadmin-3.5.13-add_rhel_fedora.patch
+# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
+Patch1: kdeadmin-3.5.13-add_rhel_fedora.patch
+
+# [kdeadmin] Fix linear alphabet string errors [Commit #1f719050]
+Patch2: bp004-1f719050.diff
Requires: trinity-kdelibs
Requires: pkgconfig
@@ -50,23 +53,24 @@ BuildRequires: trinity-kdelibs-devel
BuildRequires: rpm-devel
%description
-The kdeadmin package includes administrative tools for the K Desktop
-Environment (KDE) including:
+The kdeadmin package includes administrative tools for the Trinity Desktop
+Environment (TDE) including:
kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%prep
%setup -q -n kdeadmin
-%patch0 -p1
+
+%patch1 -p1 -b .knetworkconf
# 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" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -171,6 +175,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
+* Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Fix knetworkconf support for Fedora, adds Fedora 17
+- Fix linear alphabet string errors [Commit #1f719050]
+
* Wed Jan 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Add knetworkconf support for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Remove 'consolehelper' macro
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index a3d0206a3..1c9686f6a 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -7,10 +7,10 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
-# TDE 3.5.12 specific building variables
+# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
@@ -54,7 +54,7 @@ Summary: Development files for %{name}
Group: Development/Libraries
License: LGPLv2
Provides: kdegames3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
%{summary}.
@@ -67,7 +67,7 @@ Group: System Environment/Libraries
Requires: trinity-kdelibs
License: LGPLv2
# include to paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
@@ -80,11 +80,11 @@ License: LGPLv2
# 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" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index dcf549729..067de78ea 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -76,7 +76,7 @@ BuildRequires: OpenEXR-devel
# kpdf
BuildRequires: freetype-devel
BuildRequires: poppler-devel
-BuildRequires: poppler-qt-devel >= 0.12
+BuildRequires: poppler-qt3-devel >= 0.12
BuildRequires: libpaper-devel
# ksvg
%if 0%{?with_ksvg}
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 2ed52e51b..5c2989d21 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -44,11 +44,11 @@ Patch10: kdelibs-3.5.13-maxlinelength.patch
Patch11: kdelibs-3.5.13-enable_pcre.patch
## [kdelibs/kate] Updated syntax highlighting files [Bug #764]
Patch12: kdelibs-3.5.13-kate_syntax.patch.gz
-## [kdelibs] Adds Inotify support (backport commit 24f144faf98249012e7b1657a5dfe93750f0dfde)
+## [kdelibs] Adds Inotify support (backport commit 24f144fa)
Patch13: kdelibs-3.5.13-add_inotify_support.patch
-## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349c31fe64c31d2c050892b117a3a807179)
+## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349)
Patch14: kdelibs-3.5.13-enable_fam_gamin.patch
-## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories
+## [kdelibs/kioslave/http] Fix UTF8 Encoding for WebDAV directories [Bug #766] [Commit #e131f10b]
Patch15: kdelibs-3.5.13-fix_UTF8_encoding_for_WebDAV_directories.patch
## [kdelibs/kdeprint] Fix add printer [Bug #383]
Patch16: kdelibs-3.5.13-fix_add_printer.patch
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
new file mode 100644
index 000000000..4bd48f89a
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
@@ -0,0 +1,19 @@
+commit fd6afacf70587de329d9b2647b96469bae5e74da
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1327530995 -0600
+
+ Fix linear alphabet string errors
+
+diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c
+index 12c6941..7175011 100644
+--- a/mpg123_artsplugin/mpg123/httpget.c
++++ b/mpg123_artsplugin/mpg123/httpget.c
+@@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f)
+ void encode64 (char *source,char *destination)
+ {
+ static char *Base64Digits =
+- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ int n = 0;
+ int ssiz=strlen(source);
+ int i;
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
new file mode 100644
index 000000000..213fd6410
--- /dev/null
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
@@ -0,0 +1,49 @@
+commit 31e44a7b933cb32eaf1c9e3d8bbbaae806963956
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date: 1331690438 -0500
+
+ Remove "More Applications" from TDE menu.
+ This partially resolves bug report 653.
+
+diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop
+index 52a1b53..22e78e3 100644
+--- a/arts/builder/artsbuilder.desktop
++++ b/arts/builder/artsbuilder.desktop
+@@ -119,5 +119,5 @@ MimeType=application/x-artsbuilder;
+ DocPath=artsbuilder/index.html
+ X-DCOP-ServiceType=Multi
+ OnlyShowIn=KDE;
+-Categories=Qt;KDE;AudioVideo;X-KDE-More;
++Categories=Qt;KDE;AudioVideo;
+ NoDisplay=true
+diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop
+index d4bc38f..39a2640 100644
+--- a/arts/tools/artscontrol.desktop
++++ b/arts/tools/artscontrol.desktop
+@@ -133,5 +133,5 @@ Terminal=false
+ X-DCOP-ServiceType=Multi
+ DocPath=artsbuilder/index.html
+ OnlyShowIn=KDE;
+-Categories=Qt;KDE;AudioVideo;X-KDE-More;
++Categories=Qt;KDE;AudioVideo;
+ NoDisplay=true
+diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop
+index 2bddd99..f8f96e9 100644
+--- a/kaboodle/kaboodle.desktop
++++ b/kaboodle/kaboodle.desktop
+@@ -80,4 +80,4 @@ GenericName[zu]=Umdlali Womculo
+ Terminal=false
+ InitialPreference=6
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;AudioVideo;X-KDE-More;
++Categories=Qt;KDE;AudioVideo;
+diff --git a/kmid/kmid.desktop b/kmid/kmid.desktop
+index 3920b85..f99bdda 100644
+--- a/kmid/kmid.desktop
++++ b/kmid/kmid.desktop
+@@ -85,4 +85,4 @@ ServiceTypes=Browser/View
+ X-KDE-Library=libkmidpart
+ X-KDE-StartupNotify=true
+ X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;AudioVideo;X-KDE-More;
++Categories=Qt;KDE;AudioVideo;
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index d896d0a06..b448d96b6 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 5
+%define release 6
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -56,6 +56,11 @@ Patch5: kdemultimedia-3.5.7-pthread.patch
# [kdemultimedia] Fix MMX detection [Bug #800]
Patch10: kdemultimedia-3.5.13-fix_mmx_detection.patch
+# [tdemultimedia] Remove "More Applications" from TDE menu. [Commit #31e44a7b]
+Patch21: kdemultimedia-3.5.13-remove_more_applications.patch
+# [tdemultimedia] Fix linear alphabet string errors [Commit #fd6afacf]
+Patch22: kdemultimedia-3.5.13-fix_linear_alphabet.patch
+
Requires: %{name}-libs = %{version}-%{release}
@@ -72,7 +77,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gstreamer-devel
BuildRequires: automake libtool
-%{?_with_akode:BuildRequires: akode-devel}
+%{?_with_akode:BuildRequires: trinity-akode-devel}
%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
%{?_with_taglib:BuildRequires: taglib-devel}
%{?_with_xine:BuildRequires: xine-lib-devel}
@@ -136,15 +141,17 @@ Requires: %{name} = %{version}-%{release}
%patch3 -p1 -b .xdg
%patch5 -p1 -b .pthread
%patch10 -p1
+%patch21 -p1
+%patch22 -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 \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -172,7 +179,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?_with_xine} %{!?_with_xine:--without-xine} \
- --with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \
+ --with-extra-includes="%{_usr}/include/cdda:%{_includedir}/tqt" \
--enable-closure
%__make %{?_smp_mflags}
@@ -415,6 +422,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libyafxplayer.so
%changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
+- Updates BuildRequires
+- Remove "More Applications" from TDE menu. [Commit #31e44a7b]
+- Fix linear alphabet string errors [Commit #fd6afacf]
+
* Mon Jan 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Enables 'akode' support
- Fix MMX support [Bug #800]
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
index 82f176b5e..d5ca26124 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
@@ -58,13 +58,14 @@ Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
-# TDE 3.5.13 Fedora/RHEL patches
+# [kdenetwork] Fix kopete protocol compilation [Bug #695]
Patch10: kdenetwork-3.5.13-kopete_msn_protocol.patch
Patch11: kdenetwork-3.5.13-kopete_sms_protocol.patch
Patch12: kdenetwork-3.5.13-kopete_jabber_protocol.patch
Patch13: kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch
+# [kdenetwork] Fix references to "qname.h" [Bug #700]
Patch14: kdenetwork-3.5.13-reference_to_qmake_h.patch
-# WTF is this ? shitty hack in autotool was forgotten in CMAKE port !
+# WTF is this ? shitty hack in autotool was forgotten in CMAKE port ! [Bug #695]
Source10: kdenetwork-3.5.13-dummy.cpp
Requires: %{name}-libs = %{version}-%{release}
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch
new file mode 100644
index 000000000..b5558cd19
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_check_mail.patch
@@ -0,0 +1,21 @@
+commit 2d5f15c865de75f3147bd849ef81d3ed034f8104
+Author: Darrell Anderson <humanreadable@yahoo.com>
+Date: 1335654338 -0500
+
+ Reverse patch from GIT hash 33e649c9.
+ This resolves bug report 406.
+ Thanks to Slavek Banko.
+
+diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
+index 227f48c..cb9db70 100644
+--- a/kmail/kmcomposewin.cpp
++++ b/kmail/kmcomposewin.cpp
+@@ -4351,8 +4351,6 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
+ }
+ (*it)->cleanupHeader();
+ sentOk = kmkernel->msgSender()->send((*it), mSendMethod);
+- if (sentOk)
+- kmkernel->acctMgr()->checkMail(true);
+ }
+
+ if (!sentOk)
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch
new file mode 100644
index 000000000..4ee139a44
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_composer_crash.patch
@@ -0,0 +1,20 @@
+commit 84f29704e3fadcf1afb22da208e1dbb87feb7718
+Author: Serghei Amelian <serghei.amelian@gmail.com>
+Date: 1333065429 +0300
+
+ [kmail] fixed composer crash
+
+diff --git a/kmail/mailcomposerIface.h b/kmail/mailcomposerIface.h
+index 2858657..4cba7f3 100644
+--- a/kmail/mailcomposerIface.h
++++ b/kmail/mailcomposerIface.h
+@@ -13,6 +13,9 @@
+ class MailComposerIface : virtual public DCOPObject
+ {
+ K_DCOP
++
++ public: MailComposerIface() : DCOPObject("MailComposerIface") {}
++
+ k_dcop:
+ /**
+ Send message.
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 3cbfc506a..0f93717a4 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -7,7 +7,7 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
@@ -40,6 +40,11 @@ Source0: kdepim-%{version}.tar.gz
# [kdepim] Fix compilation with GCC 4.7 [Bug #958]
Patch1: kdepim-3.5.13-fix_gcc47_compilation.patch
+# [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
+Patch2: kdepim-3.5.13-fix_check_mail.patch
+
+# [tdepim] Fix kmail composer crash [Bug #953]
+Patch3: kdepim-3.5.13-fix_composer_crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -87,6 +92,8 @@ Development files for %{name}.
%prep
%setup -q -n kdepim
%patch1 -p1 -b .gcc47
+%patch2 -p1
+%patch3 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -122,8 +129,7 @@ cd build
-DBUILD_ALL=ON \
..
-# Do not use %{?_smp_mflags} !
-%__make
+%__make %{?_smp_mflags}
%install
export PATH="%{_bindir}:${PATH}"
@@ -172,6 +178,8 @@ export PATH="%{_bindir}:${PATH}"
%changelog
* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Fix compilation with GCC 4.7 [Bug #958]
+- Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
+- Fix kmail composer crash [Bug #953]
* Sun Nov 27 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Add missing files '*.la'
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index 657e53abe..75288260f 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -121,13 +121,12 @@ More Utilities for the K Desktop Environment:
# 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" \
- -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|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
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch
new file mode 100644
index 000000000..28a24eefb
--- /dev/null
+++ b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch
@@ -0,0 +1,9 @@
+--- kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am.ORI 2012-05-01 09:52:59.334490901 -0400
++++ kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am 2012-05-01 09:53:10.229644843 -0400
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = $(wildcard *.html) $(wildcard *.c) $(wildcard *.h) $(wildcard *.asm) $(wildcard *.txt) \
+- 8087_sav.asm HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \
++ HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \
+ myio.mak myiodemo.cpp myline.cpp mystream.cpp pdn.lst read.me resource.lst rg_qsort.c1 \
+ rg_qsort.c2 snippets._c_ snippets.ndx snippets.txt snippets.wc storage.typ str.cpp str.doc
+
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index e47bc717e..79a037dfb 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -47,6 +47,8 @@ Patch1: c_cpp_reference-2.0.2-config.patch
Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
# Fix compilation with GCC 4.7
Patch3: kdevelop-3.5.13-gcc47.patch
+# Fix installation of 'asm' files
+Patch4: c_cpp_reference-2.0.2-install.patch
Provides: kdevelop3 = %{version}-%{release}
@@ -128,6 +130,7 @@ Requires: %{name} = %{version}-%{release}
%patch1 -p0 -b .config
%patch2 -p1
%patch3 -p1 -b .gcc47
+%patch4 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -234,6 +237,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix installation on Fedora 17
+- Fix compilation on GCC 4.7
+
* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Fix HTML directory location
diff --git a/redhat/libraries/libkipi/trinity-libkipi.spec b/redhat/libraries/libkipi/trinity-libkipi.spec
index fad0abae5..130fb1507 100644
--- a/redhat/libraries/libkipi/trinity-libkipi.spec
+++ b/redhat/libraries/libkipi/trinity-libkipi.spec
@@ -70,12 +70,13 @@ Homepage: http://www.kipi-plugins.org/
# 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"
+%__sed -i admin/acinclude.m4.in \
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|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
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
diff --git a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
index 0be591792..6a1659ace 100644
--- a/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/trinity-libksquirrel.spec
@@ -78,12 +78,13 @@ Tools for KSquirrel.
# 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"
+%__sed -i admin/acinclude.m4.in \
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common" cvs
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__make -f "admin/Makefile.common"
%build
@@ -109,13 +110,9 @@ export PATH="%{_bindir}:${PATH}"
%post
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..199c7e0ae
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,33 @@
+--- python-trinity/sip/kdecore/kaccel.sip.ORI 2012-05-01 23:10:27.686395190 +0200
++++ python-trinity/sip/kdecore/kaccel.sip 2012-05-01 23:10:39.955113222 +0200
+@@ -35,7 +35,7 @@
+ KAccel (QWidget* /TransferThis/, const char* = 0);
+ KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
+ KAccelActions& actions ();
+- bool isEnabled () const;
++ bool isEnabled ();
+ void setEnabled (bool);
+ bool setAutoUpdate (bool);
+
+--- python-trinity/sip/kdecore/kaccelbase.sip.ORI 2012-05-01 23:13:58.455551130 +0200
++++ python-trinity/sip/kdecore/kaccelbase.sip 2012-05-01 23:14:14.835174681 +0200
+@@ -48,7 +48,7 @@
+ KAccelBase (int);
+ uint actionCount () const;
+ KAccelActions& actions ();
+- bool isEnabled () const;
++ bool isEnabled ();
+ KAccelAction* actionPtr (const QString&);
+ KAccelAction* actionPtr (const KKey&);
+ KAccelAction* actionPtr (const KKeyServer::Key&);
+--- python-trinity/sip/kdecore/kglobalaccel.sip.ORI 2012-05-01 23:19:11.934346517 +0200
++++ python-trinity/sip/kdecore/kglobalaccel.sip 2012-05-01 23:19:18.755189755 +0200
+@@ -33,7 +33,7 @@
+
+ public:
+ KGlobalAccel (QObject*, const char* = 0);
+- bool isEnabled () const;
++ bool isEnabled ();
+ void setEnabled (bool);
+ KAccelAction* insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
+
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
index a2949fc2b..4ca22d637 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-install_directories.patch
@@ -1,5 +1,5 @@
---- configure.py.ORI 2011-12-03 17:07:41.589390850 +0100
-+++ configure.py 2011-12-03 17:14:35.226888035 +0100
+--- a/configure.py.ORI 2011-12-03 17:07:41.589390850 +0100
++++ b/configure.py 2011-12-03 17:14:35.226888035 +0100
@@ -786,7 +786,7 @@
sipconfig.ParentMakefile(
configuration = pyqtcfg,
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec
index dec9a719a..0a1adfc82 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/python-trinity/python-trinity.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp python-trinity
%define version 3.16.3
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -34,7 +34,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
## RHEL/Fedora patches
-Patch0: python-trinity-3.5.13-install_directories.patch
+Patch1: python-trinity-3.5.13-install_directories.patch
+
+# [python-trinity] Fix compilation with GCC 4.7
+Patch2: python-trinity-3.5.13-fix_gcc47_compilation.patch
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
@@ -75,11 +78,12 @@ tips and working code you can use to learn from.
%prep
%setup -q -n libraries/%{kdecomp}
-%patch0 -p0
+%patch1 -p1
+%patch2 -p1
# Hack to get TQT include files under /opt
%__sed -i "configure.py" \
- -e "s,/usr/include/tqt,%{_includedir}/tqt,g"
+ -e "s|/usr/include/tqt|%{_includedir}/tqt|g"
%build
export PATH="%{_bindir}:${PATH}"
@@ -125,5 +129,9 @@ export PATH="%{_bindir}:${PATH}"
%Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-2
+- Rebuild for Fedora 17
+- Fix compilation with GCC 4.7
+
* Fri Dec 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.16.3-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/main b/redhat/main
new file mode 120000
index 000000000..945c9b46d
--- /dev/null
+++ b/redhat/main
@@ -0,0 +1 @@
+. \ No newline at end of file
diff --git a/redhat/tdebase b/redhat/tdebase
new file mode 120000
index 000000000..40cf4e3ad
--- /dev/null
+++ b/redhat/tdebase
@@ -0,0 +1 @@
+kdebase \ No newline at end of file