summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec4
-rw-r--r--redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec16
-rw-r--r--redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec12
3 files changed, 26 insertions, 6 deletions
diff --git a/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec b/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
index b9ac5ae96..9a1031d72 100644
--- a/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
+++ b/redhat/applications/digikam/trinity-digikam-3.5.13-sru.spec
@@ -25,7 +25,7 @@
Name: trinity-%{kdecomp}
Summary: digital photo management application for KDE [Trinity]
Version: 0.9.6
-Release: 3%{?dist}%{?_variant}
+Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -300,6 +300,6 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
%Changelog
-* Wed Aug 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3
+* Wed Aug 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4
- Switch to v3.5.13-sru branch.
diff --git a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
index 7456ffd9d..409e4c706 100644
--- a/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
+++ b/redhat/applications/gtk-qt-engine/trinity-gtk-qt-engine.spec
@@ -26,7 +26,7 @@
Name: trinity-%{kdecomp}
Summary: theme engine using Qt for GTK+ 2.x and Trinity
Version: 0.8
-Release: 2%{?dist}%{?_variant}
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -39,6 +39,9 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
+Source1: gtk-qt-engine.rc.sh
+Source2: gtkrc-2.0-kde4
+Source3: gtkrc-2.0-kde-kde4
# [gtk-qt-engine] Fix inclusion of 'glib.h'
Patch1: gtk-qt-engine-3.5.13-fix_glib_include.patch
@@ -104,6 +107,11 @@ export PATH="%{tde_bindir}:${PATH}"
%find_lang %{kdecomp}
+# Adds TDE's specific GTKRC
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
+%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
+%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
+
%clean
%__rm -rf %{buildroot}
@@ -115,6 +123,9 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_tdelibdir}/kcm_kcmgtk.la
%{tde_tdelibdir}/kcm_kcmgtk.so
%{tde_appdir}/kcmgtk.desktop
+%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh
+%{tde_datadir}/kgtk/.gtkrc-2.0-kde4
+%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4
# The following files are outside TDE's directory
%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so
@@ -122,6 +133,9 @@ export PATH="%{tde_bindir}:${PATH}"
%Changelog
+* Mon Aug 27 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-3
+- Add missing gtkrc files
+
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8-2
- Rebuilt for Fedora 17
- Fix FTBFS with newer glib
diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
index 3163d1b58..d0f1e46c6 100644
--- a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
+++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
@@ -26,7 +26,7 @@
Name: trinity-%{kdecomp}
Summary: Use KDE dialogs in Gtk apps
Version: 0.10.2
-Release: 2%{?dist}%{?_variant}
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -102,8 +102,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# The "preload" file is used by "startkde" script
+%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk"
+echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload"
-%find_lang kdialogd3 || touch %{kdecomp}.lang
+%find_lang kdialogd3
@@ -121,9 +124,12 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_bindir}/kqt3-wrapper
%{tde_libdir}/kgtk/libkgtk2.so
%{tde_libdir}/kgtk/libkqt3.so
-
+%{tde_datadir}/kgtk/preload
%Changelog
+* Sun Aug 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-3
+- Add 'preload' file for startkde script
+
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.2-2
- Rebuilt for Fedora 17
- Removes post and postun