RHEL/Fedora/MGA/MDV/Suse: update applications for TDE 3.5.13.1

3 files changed, 156 insertions, 0 deletions

diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch b/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch
new file mode 100644
index 000000000..fd49dd7bc
--- /dev/null
+++ b/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch
@@ -0,0 +1,11 @@
+--- ktechlab-3.5.13.1/src/Makefile.am.ORI	2012-10-04 22:06:34.854692286 +0200
++++ ktechlab-3.5.13.1/src/Makefile.am	2012-10-04 22:06:44.350472919 +0200
+@@ -19,7 +19,7 @@
+ 	$(top_builddir)/src/mechanics/libmechanics.la $(top_builddir)/src/electronics/libelectronics.la \
+ 	$(top_builddir)/src/electronics/simulation/libelements.la $(top_builddir)/src/electronics/components/libcomponents.la \
+ 	$(top_builddir)/src/languages/liblanguages.la $(top_builddir)/src/drawparts/libdrawparts.la \
+-	$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) -lgpsimgui
++	$(top_builddir)/src/core/libcore.la -lkutils -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_GPSIM) $(LIB_GPSIM)
+ 
+ # which sources should be compiled for ktechlab
+ ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
diff --git a/redhat/applications/ktechlab/trinity-ktechlab-3.5.13.1.spec b/redhat/applications/ktechlab/trinity-ktechlab-3.5.13.1.spec
new file mode 100644
index 000000000..20361e479
--- /dev/null
+++ b/redhat/applications/ktechlab/trinity-ktechlab-3.5.13.1.spec
@@ -0,0 +1,145 @@
+# Default version for this component
+%define kdecomp ktechlab
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	circuit simulator for microcontrollers and electronics [Trinity]
+Version:	0.3
+Release:	3%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.1.tar.gz
+
+# [ktechlab] Removes harcoded gpsim linking
+Patch1:		ktechlab-3.5.13.1-remove_gpsim_link.patch
+
+BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+
+%description
+KTechlab is a circuit simulator with a nice, clickable and discoverable
+interface. It supports many discrete components, logic circuits as well
+as PIC programming in its own Basic dialect and some form of assembler. 
+
+Homepage: http://ktechlab.org/
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{kdecomp}-3.5.13.1
+%patch1 -p1 -b .gpsim
+
+# 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|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
+
+%__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; . /etc/profile.d/qt3.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+%configure \
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/ktechlab
+%{tde_bindir}/microbe
+%{tde_datadir}/applnk/Development/ktechlab.desktop
+%{tde_datadir}/apps/katepart/syntax/microbe.xml
+%{tde_datadir}/apps/ktechlab
+%{tde_datadir}/config.kcfg/ktechlab.kcfg
+%{tde_tdedocdir}/HTML/en/ktechlab/
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-circuit.desktop
+%{tde_datadir}/mimelnk/application/x-flowcode.desktop
+%{tde_datadir}/mimelnk/application/x-ktechlab.desktop
+%{tde_datadir}/mimelnk/application/x-microbe.desktop
+
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.3-3
+- Initial build for TDE 3.5.13.1
+
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-2
+- Fix HTML directory location
+
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktechlab/trinity-ktechlab.spec b/redhat/applications/ktechlab/trinity-ktechlab-3.5.13.spec
index 45134f847..45134f847 100644
--- a/redhat/applications/ktechlab/trinity-ktechlab.spec
+++ b/redhat/applications/ktechlab/trinity-ktechlab-3.5.13.spec