RHEL/Fedora: add kbarcode, kdesvn, kgtk-qt3, kpicosim, kima

8 files changed, 698 insertions, 7 deletions

diff --git a/redhat/applications/kbarcode/trinity-kbarcode.spec b/redhat/applications/kbarcode/trinity-kbarcode.spec
new file mode 100644
index 000000000..4af036bb6
--- /dev/null
+++ b/redhat/applications/kbarcode/trinity-kbarcode.spec
@@ -0,0 +1,132 @@
+# Default version for this component
+%define kdecomp kbarcode
+%define version 2.0.6
+%define release 1
+
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	barcode and label printing application for Trinity
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <[email protected]>
+URL:		http://www.kbarcode.net
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+KBarcode is a barcode and label printing application for Trinity. It can be used
+to print everything from simple business cards up to complex labels with
+several barcodes (e.g. article descriptions).
+
+KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard,
+batch import of data for batch printing labels (directly from the delivery
+note), thousands of predefined labels, database management tools and
+translations in many languages. Even printing more than 10.000 labels in one
+go is no problem for KBarcode. Data for printing can be imported from several
+different data sources, including SQL databases, CSV files and the KDE address
+book.
+
+Additionally it is a simple barcode generator (similar to the old xbarcode you
+might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are
+supported. Even complex 2D barcodes are supported using third party tools. The
+generated barcodes can be directly printed or you can export them into images
+to use them in another application.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# 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"
+
+%__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"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/kbarcode
+%{tde_libdir}/kfile_kbarcode.la
+%{tde_libdir}/kfile_kbarcode.so
+%{_datadir}/applications/kde/kbarcode-batch.desktop
+%{_datadir}/applications/kde/kbarcode-editor.desktop
+%{_datadir}/applications/kde/kbarcode-label.desktop
+%{_datadir}/applications/kde/kbarcode-single.desktop
+%{_datadir}/applications/kde/kbarcode.desktop
+%{_datadir}/apps/kbarcode
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/services/kfile_kbarcode.desktop
+
+
+%Changelog
+* Wed Nov 30 2011 Francois Andriot <[email protected]> - 2.0.6-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kdesvn/trinity-kdesvn.spec b/redhat/applications/kdesvn/trinity-kdesvn.spec
new file mode 100644
index 000000000..20904fd46
--- /dev/null
+++ b/redhat/applications/kdesvn/trinity-kdesvn.spec
@@ -0,0 +1,196 @@
+# Default version for this component
+%define kdecomp kdesvn
+%define version 1.0.4
+%define release 1
+
+# 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 _mandir %{_prefix}/share/man
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+Name:		trinity-%{kdecomp}
+Summary:	subversion client with tight KDE integration [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <[email protected]>
+URL:		http://www.elliptique.net/~ken/kima/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	subversion-devel
+Requires:		trinity-kdesvn-kio-plugins = %{version}-%{release}
+
+
+%description
+KDESvn is a graphical client for the subversion revision control
+system (svn).
+
+Besides offering common and advanced svn operations, it features
+a tight integration into KDE and can be embedded into other KDE 
+applications like konqueror via the KDE component technology KParts.
+
+
+%package -n trinity-libsvnqt
+Group:		Development/Libraries
+Summary: Qt wrapper library for subversion [Trinity]
+
+%description -n trinity-libsvnqt
+This package provides svnqt, a Qt wrapper library around the 
+subversion library.
+
+It is based on the RapidSvn SvnCpp library, a subversion client API 
+written in C++.
+
+%package -n trinity-libsvnqt-devel
+Group:		Development/Libraries
+Requires:	trinity-libsvnqt = %{version}-%{release}
+Requires:	qt-devel
+Requires:	subversion-devel
+Summary:	Qt wrapper library for subversion (development files) [Trinity]
+
+%description -n trinity-libsvnqt-devel
+This package contains the header files and symbolic links that developers
+using svnqt will need.
+
+
+%package kio-plugins
+Group:		Development/Libraries
+Conflicts:	trinity-kdesdk-kio-plugins
+Summary:	subversion I/O slaves for Trinity
+
+%description kio-plugins
+This packages includes KIO slaves for svn, svn+file, svn+http, 
+svn+https, svn+ssh. This allows you to access subversion repositories 
+inside any KIO enabled KDE application.
+
+This package is part of tdesvn-trinity.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+find . -name CMakeLists.txt -exec %__sed -i {} \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \
+  -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \
+  \;
+
+# More ugly hack to add TQT include directory in CMakeLists.txt	
+%__sed -i CMakeLists.txt \
+  -e "s,^\(INCLUDE_DIRECTORIES (\)$,\1\n%{_includedir}/tqt,"
+
+# Moves HTML files to the correect location
+find . -name "*.cmake" -exec %__sed -i {} \
+  -e "s,/doc/HTML,/doc/kde/HTML,g" \
+  \;
+
+%build
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%__mkdir_p build
+cd build
+%cmake ..
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/kdesvn
+%{_bindir}/kdesvnaskpass
+%{tde_libdir}/libkdesvnpart.la
+%{tde_libdir}/libkdesvnpart.so
+%{_datadir}/applications/kde/kdesvn.desktop
+%{_datadir}/apps/kconf_update/kdesvn-use-external-update.sh
+%{_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd
+%{_datadir}/apps/kdesvn/kdesvnui.rc
+%{_datadir}/apps/kdesvnpart/kdesvn_part.rc
+%{_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop
+%{_datadir}/config.kcfg/kdesvn_part.kcfg
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/*/*/*.svgz
+%{_mandir}/man1/kdesvn.1
+%{_mandir}/man1/kdesvnaskpass.1
+%{tde_docdir}/HTML
+
+%files -n trinity-libsvnqt
+%{_libdir}/libsvnqt.so.4
+%{_libdir}/libsvnqt.so.4.2.2
+
+%files -n trinity-libsvnqt-devel
+%{_includedir}/svnqt
+%{_libdir}/libsvnqt.so
+
+%files kio-plugins
+%{_datadir}/services/kded/kdesvnd.desktop
+%{_datadir}/services/ksvn+file.protocol
+%{_datadir}/services/ksvn+http.protocol
+%{_datadir}/services/ksvn+https.protocol
+%{_datadir}/services/ksvn+ssh.protocol
+%{_datadir}/services/ksvn.protocol
+%{_datadir}/services/svn+file.protocol
+%{_datadir}/services/svn+http.protocol
+%{_datadir}/services/svn+https.protocol
+%{_datadir}/services/svn+ssh.protocol
+%{_datadir}/services/svn.protocol
+%{tde_libdir}/kio_ksvn.la
+%{tde_libdir}/kio_ksvn.so
+%{tde_libdir}/kded_kdesvnd.la
+%{tde_libdir}/kded_kdesvnd.so
+
+
+%Changelog
+* Thu Dec 01 2011 Francois Andriot <[email protected]> - 1.0.4-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
new file mode 100644
index 000000000..f8ef2b9e1
--- /dev/null
+++ b/redhat/applications/kgtk-qt3/trinity-kgtk-qt3.spec
@@ -0,0 +1,116 @@
+# Default version for this component
+%define kdecomp kgtk-qt3
+%define version 0.10.2
+%define release 1
+
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Use KDE dialogs in Gtk apps
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <[email protected]>
+URL:		http://www.trinitydesktop.org
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+This is an LD_PRELOAD hack that allows most GTK
+applications to use Trinity's file dialogs when run under Trinity.
+
+The Gtk file chooser functions have been overridden to communicate
+with this KDE module/application.
+
+This package includes the kqt3-wrapper
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# Ugly hack to modify TQT include directory inside autoconf files.
+# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
+find . -name CMakeLists.txt -exec sed -i {} \
+  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
+  -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \
+  -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \
+  \;
+
+%build
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir} -L${QTLIB} -lX11"
+
+%__mkdir_p build
+cd build
+%cmake ..
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%find_lang kdialogd3 || touch %{kdecomp}.lang
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f kdialogd3.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_bindir}/kdialogd-wrapper
+%{_bindir}/kdialogd3
+%{_bindir}/kgtk-wrapper
+%{_bindir}/kgtk2-wrapper
+%{_bindir}/kqt3-wrapper
+%{_libdir}/kgtk/libkgtk2.so
+%{_libdir}/kgtk/libkqt3.so
+
+
+%Changelog
+* Thu Dec 01 2011 Francois Andriot <[email protected]> - 0.10.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kima/trinity-kima.spec b/redhat/applications/kima/trinity-kima.spec
new file mode 100644
index 000000000..a6f8e2ab1
--- /dev/null
+++ b/redhat/applications/kima/trinity-kima.spec
@@ -0,0 +1,113 @@
+# Default version for this component
+%define kdecomp kima
+%define version 0.7.3.2
+%define release 1
+
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	kicker monitoring applet [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <[email protected]>
+URL:		http://www.elliptique.net/~ken/kima/
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+This applet monitors various temperature,
+frequency and fan sources in your kicker
+panel.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# 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"
+
+%__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"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_libdir}/libkima.la
+%{tde_libdir}/libkima.so
+%{_datadir}/apps/kicker/applets/kima.desktop
+%{tde_docdir}/HTML/en/kima/common
+%{tde_docdir}/HTML/en/kima/index.cache.bz2
+%{tde_docdir}/HTML/en/kima/index.docbook
+
+
+%Changelog
+* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.7.3.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec
new file mode 100644
index 000000000..d162b6413
--- /dev/null
+++ b/redhat/applications/kpicosim/trinity-kpicosim.spec
@@ -0,0 +1,112 @@
+# Default version for this component
+%define kdecomp kpicosim
+%define version 0.6a
+%define release 1
+
+# 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
+%endif
+
+# TDE 3.5.13 specific building variables
+BuildRequires: autoconf automake libtool m4
+%define tde_docdir %{_docdir}/kde
+%define tde_includedir %{_includedir}/kde
+%define tde_libdir %{_libdir}/trinity
+
+
+Name:		trinity-%{kdecomp}
+Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
+Version:	%{?version}
+Release:	%{?release}%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <[email protected]>
+URL:		http://www.trinitydesktop.org
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-kdelibs-devel
+BuildRequires:	trinity-kdebase-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+kpicosim is a development environment for the Xilinx 
+PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
+The environment has an editor with syntax highlighting, compiler,
+simulator and export functions to VHDL, HEX and MEM files.
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+
+# 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"
+
+%__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"
+
+
+%build
+export PATH="%{_bindir}:${PATH}"
+export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+
+%configure \
+	--disable-rpath \
+    --with-extra-includes=%{_includedir}/tqt:%{tde_includedir}
+
+# SMP safe !
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+
+%find_lang %{kdecomp} || touch %{kdecomp}.lang
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_bindir}/kpicosim
+%{_datadir}/applnk/Development/kpicosim.desktop
+%{_datadir}/apps/katepart/syntax/psm.xml
+%{_datadir}/apps/kpicosim
+%{tde_docdir}/HTML/en/kpicosim
+%{_datadir}/icons/hicolor/*/apps/kpicosim.png
+
+
+%Changelog
+* Wed Nov 30 2011 Francois Andriot <[email protected]> - 0.6a-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/components.txt b/redhat/components.txt
index 1f95fe09f..d4d16049a 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -9,7 +9,6 @@ dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
 dependencies/arts
-trinity-desktop
 #trinity-settings
 trinity-live
 kdelibs
@@ -34,6 +33,7 @@ kde-i18n
 extras/ksensors
 extras/libkarma
 #extras/libkexif
+extras/trinity-desktop
 applications/k3b
 applications/abakus
 applications/dolphin
@@ -93,3 +93,9 @@ applications/knetstats
 applications/knowit
 applications/kpilot
 applications/kdirstat
+applications/kbarcode
+applications/kpicosim
+applications/kgtk-qt3
+applications/kima
+applications/kdesvn
+applications/kde-guidance
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index e54847b54..daae84e79 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -11,7 +11,7 @@ enabled=1
 gpgcheck=0
 
 [trinity-3.5.13-rhel-source]
-name=trinity-3.5.13-f16-source
+name=trinity-3.5.13-rhel-source
 baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
 enabled=1
 gpgcheck=0
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 1820928c9..761e05e75 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.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"
@@ -105,12 +105,25 @@ Summary:	Yum configuration files for Trinity
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d
-%if 0%{?fedora}
-%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d
-%else
-%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d
+
+# Fedora repo file
+%if 0%{?fedora} > 0
+%__sed %{SOURCE0} \
+  -e 's/\$releasever/%{fedora}/g' \
+  -e 's/-fedora/-f%{fedora}/g' \
+  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-f%{fedora}.repo
+%endif
+
+# RHEL repo file
+%if 0%{?rhel} > 0
+%__sed %{SOURCE1} \
+  -e 's/\$releasever/%{rhel}/g' \
+  -e 's/-rhel/-el%{rhel}/g' \
+  >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
 %endif
 
+%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+
 %files
 
 %files dev
@@ -123,5 +136,8 @@ Summary:	Yum configuration files for Trinity
 %{_sysconfdir}/yum.repos.d/*.repo
 
 %changelog
+* Wed Nov 30 2011 Francois Andriot <[email protected]> - 3.5.13-3
+- Fix repo files name and content
+
 * Sat Nov 12 2011 Francois Andriot <[email protected]> - 3.5.13-2
 - Add 'repo' package