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

3 files changed, 168 insertions, 0 deletions

diff --git a/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch b/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch
new file mode 100644
index 000000000..b549b225b
--- /dev/null
+++ b/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch
@@ -0,0 +1,7 @@
+--- piklab-3.5.13.1/src/progs/sdcdb/Makefile.am.ORI	2012-10-04 22:23:26.210470311 +0200
++++ piklab-3.5.13.1/src/progs/sdcdb/Makefile.am	2012-10-04 22:23:30.531371664 +0200
+@@ -1,3 +1,3 @@
+ INCLUDES = -I$(top_srcdir)/src $(all_includes)
+ METASOURCES = AUTO
+-SUBDIRS = base gui
++SUBDIRS = base
diff --git a/redhat/applications/piklab/trinity-piklab-3.5.13.1.spec b/redhat/applications/piklab/trinity-piklab-3.5.13.1.spec
new file mode 100644
index 000000000..80581390b
--- /dev/null
+++ b/redhat/applications/piklab/trinity-piklab-3.5.13.1.spec
@@ -0,0 +1,161 @@
+# Default version for this component
+%define kdecomp piklab
+
+# 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_tdedocdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	IDE for PIC-microcontroller development [Trinity]
+Version:	0.15.2
+Release:	4%{?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
+
+# [piklab] Do not build the 'gui' directory
+Patch1:		piklab-3.5.13.1-remove_gui_dir.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
+
+BuildRequires:	readline-devel
+
+%description
+Piklab is an integrated development environment for applications based on
+Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment.
+
+Support for several compiler and assembler toolchains is integrated. The
+GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and
+PICkit2 programmers, the PicStart+ programmer, and most direct programmers
+are supported. A command-line programmer and debugger are also available.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n %{kdecomp}-3.5.13.1
+%patch1 -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|%{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}
+
+# Incorrect extension on manpage
+%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1
+
+%find_lang %{kdecomp}
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+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}/piklab
+%{tde_bindir}/piklab-coff
+%{tde_bindir}/piklab-hex
+%{tde_bindir}/piklab-prog
+%{tde_tdeappdir}/piklab.desktop
+%{tde_datadir}/apps/katepart/syntax/asm-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml
+%{tde_datadir}/apps/katepart/syntax/coff-pic.xml
+%{tde_datadir}/apps/katepart/syntax/jal-pic.xml
+%{tde_datadir}/apps/piklab
+%{tde_tdedocdir}/HTML/en/piklab
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/mimelnk/application/x-piklab.desktop
+%{tde_mandir}/man1/piklab-coff.1
+%{tde_mandir}/man1/piklab-hex.1
+%{tde_mandir}/man1/piklab-prog.1
+%{tde_mandir}/man1/piklab.1
+
+
+%changelog
+* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-4
+- Initial build for TDE 3.5.13.1
+
+* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
+- Fix MAN directory location
+- Fix compilation with GCC 4.7 [Bug #958]
+
+* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
+- Fix HTML directory location
+
+* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab-3.5.13.spec
index 93fd28370..93fd28370 100644
--- a/redhat/applications/piklab/trinity-piklab.spec
+++ b/redhat/applications/piklab/trinity-piklab-3.5.13.spec