summaryrefslogtreecommitdiffstats
path: root/redhat/kdebase/trinity-kdebase-3.5.12.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/kdebase/trinity-kdebase-3.5.12.spec')
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.12.spec119
1 files changed, 89 insertions, 30 deletions
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 1e0b0e18b..721c1d781 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 12
+%define release 13
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -53,57 +53,86 @@ Patch1: http://www.trinitydesktop.org/patches/r1201523.diff
# [kdebase/kcontrol] make it compatible with openssl < 1.0
Patch2: http://www.trinitydesktop.org/patches/r1201705.diff
# Fix My Documents shortcut on desktop
-Patch4: http://www.trinitydesktop.org/patches/r1182808.diff
+Patch3: http://www.trinitydesktop.org/patches/r1182808.diff
# [kdebase] fixed an incompatibility with gcc 4.5
-Patch8: http://www.trinitydesktop.org/patches/r1221326.diff
+Patch4: http://www.trinitydesktop.org/patches/r1221326.diff
# TDE Official patches (from SVN), modified
# [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
-Patch12: kdebase-3.5.12-r1220975.patch
+Patch5: kdebase-3.5.12-r1220975.patch
# [kdebase] Another invalid constructor per gcc 4.5
-Patch9: kdebase-3.5.12-r1220927.patch
+Patch6: kdebase-3.5.12-r1220927.patch
+
+# TDE unofficial patches, fixing FTBFS
+## Fix for DBUS include files in RHEL6
+Patch7: kdebase-3.5.12-shutdowndlg-dbus-include.patch
+## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
+Patch8: kdebase-3.5.12-disable-krandr.patch
# TDE for RHEL/Fedora specific patches
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies "open terminal here" on desktop
-Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
+Patch10: kdebase-3.5.12-kdesu-noignorebutton.patch
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
+Patch11: kdebase-3.5.12-desktop-openterminalhere.patch
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch6: kdebase-3.5.12-halmountoptions.patch
+Patch12: kdebase-3.5.12-halmountoptions.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
+Patch13: kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+Patch14: kdebase-3.5.12-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch11: kdebase-3.5.13-startkde_icon.patch
-
-# TDE 3.5.12 patches
-# Fix for DBUS include files in RHEL6
-Patch0: kdebase-3.5.12-shutdowndlg-dbus-include.patch
-# [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch100: kdebase-3.5.12-disable-krandr.patch
-
+Patch15: kdebase-3.5.13-startkde_icon.patch
+## [kdebase/startkde] Fixes duplicate and incorrect TDE directories location
+Patch16: kdebase-3.5.12-startkde_directories.patch
+
+# TDE unofficial patches for enhanced features
+## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
+Patch20: kdebase-3.5.13-kate_mru.patch
+## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
+Patch21: kdebase-3.5.12-kio_man_utf8.patch
+## [kdebase/konqueror] Re-enable 'open tab in background'
+Patch22: kdebase-3.5.12-konq_menu_tab_background.patch
+## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
+Patch23: kdebase-3.5.13-konqsidebar_documents.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single
%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
+
+Requires: fedora-release-notes
+%define tde_aboutlabel Fedora 15
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif
# Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16
Requires: verne-backgrounds-single
%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
+
+Requires: fedora-release-notes
+%define tde_aboutlabel Fedora 16
+%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif
# RHEL 5 Theme
%if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic
%define tde_bg /usr/share/backgrounds/images/default.jpg
+
+Requires: indexhtml
+%define tde_aboutlabel Enterprise Linux 5
+%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
# RHEL 6 Theme
%if 0%{?rhel} == 6
Requires: redhat-logos
%define tde_bg /usr/share/backgrounds/default.png
+
+Requires: redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 6
+%define tde_aboutpage /usr/share/doc/HTML/index.html
%endif
BuildRequires: tqtinterface-devel
@@ -159,7 +188,7 @@ Requires: kde-settings-kdm
%endif
Requires: redhat-menus
-Provides: kdebase%{?_qt_suffix} = %{version}
+#Provides: kdebase%{?_qt_suffix} = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix} <= 3.5.10
%endif
@@ -185,7 +214,7 @@ Requires: %{name}
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
Summary: %{summary} - Development files
-Provides: kdebase%{?_qt_suffix}-devel = %{version}
+#Provides: kdebase%{?_qt_suffix}-devel = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-devel <= 3.5.10
%endif
@@ -201,7 +230,7 @@ Kate plugins or KWin styles.
Summary: Extra applications from %{name}
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
-Provides: kdebase%{?_qt_suffix}-extras = %{version}
+#Provides: kdebase%{?_qt_suffix}-extras = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
%endif
@@ -217,7 +246,7 @@ Obsoletes: kdebase%{?_qt_suffix}-extras <= 3.5.10
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs
-Provides: kdebase%{?_qt_suffix}-libs = %{version}
+#Provides: kdebase%{?_qt_suffix}-libs = %{version}
%if "%{?_prefix}" == "/usr"
Obsoletes: kdebase%{?_qt_suffix}-libs <= 3.5.10
%endif
@@ -243,7 +272,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
%prep
%setup -q -n kdebase
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -251,13 +279,24 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%if 0%{?rhel} && 0%{?rhel} < 6
%patch8 -p1
-%patch9 -p1
+%endif
+
+%patch10 -p1
%patch11 -p1
%patch12 -p1
-%if 0%{?rhel} && 0%{?rhel} < 6
-%patch100 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+
+%patch20 -p4
+%if 0%{?rhel} > 0
+%patch21 -p1
%endif
+%patch22 -p1
+%patch23 -p1
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -268,7 +307,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
# TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
-
%__sed -i "startkde" \
-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
@@ -278,6 +316,17 @@ Protocol handlers (KIOslaves) for personal information management, including:
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
+# TDE branding: removes KUbuntu references
+%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
+ -e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
+%__sed -i "konqueror/about/konq_aboutpage.cc" \
+ -e "s|About Kubuntu|About %{tde_aboutlabel}|" \
+ -e "s|help:/kubuntu/|%{tde_aboutpage}|" \
+ -e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
+%__sed -i "konqueror/about/launch.html" \
+ -e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
+%__sed -i "kdm/config.def" \
+ -e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -321,7 +370,7 @@ export IMAKEINCLUDE="-I/usr/share/X11/config"
# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
%__sed -i "%{?buildroot}%{_bindir}/startkde" \
- -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
+ -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
@@ -442,7 +491,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
# Pam configuration
%{_sysconfdir}/pam.d/*
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING COPYING-DOCS README README.pam
%{tde_docdir}/HTML/en/*
%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
%{_bindir}/genkdmconf
@@ -584,7 +633,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
# TDE 3.5.12 specific
%{_bindir}/kde3
-%exclude %{_datadir}/applications/kde/display.desktop
+#%exclude
+%{_datadir}/applications/kde/display.desktop
%exclude %{_datadir}/fonts/override/fonts.dir
%{_docdir}/kdm/README
@@ -620,6 +670,15 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libkdeinit_*.*
%changelog
+* Thu Dec 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-13
+- Backports patches from TDE 3.5.13-10
+- Removes Kubuntu branding [TDE Bug #449]
+- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
+- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
+- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
+- Fix error message 'cannot find parent folder' on konqueror sidebar
+- Fix KDEDIRS and other variables in 'startkde', that messes up translations.
+
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
- Updates Kickoff menu Fix [TDE Bugs #281, #508]
- Add distribution-specific start button icon
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-12 11:31:27 +0000