summaryrefslogtreecommitdiffstats
path: root/redhat/applications/ktechlab
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-22 22:07:38 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-22 22:07:38 +0200
commitf01a421b4fe4d008074832708f24472aa857a48c (patch)
treefa6ffcd54454c77e2cef01fe390288b96b5759e6 /redhat/applications/ktechlab
parent2dde2881b4966f056140fff2d3352e747f5aa9cb (diff)
downloadtde-packaging-f01a421b4fe4d008074832708f24472aa857a48c.tar.gz
tde-packaging-f01a421b4fe4d008074832708f24472aa857a48c.zip
RPM packaging: update ksplash-engine-moodin, ksquirrel, kstreamripper, ksystemlog, ktechlab
Diffstat (limited to 'redhat/applications/ktechlab')
-rw-r--r--redhat/applications/ktechlab/ktechlab-14.0.0.spec89
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch13
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch11
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch11
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.1.spec145
-rw-r--r--redhat/applications/ktechlab/ktechlab-3.5.13.spec140
6 files changed, 59 insertions, 350 deletions
diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
index 04386cbe1..d0fd4e253 100644
--- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec
+++ b/redhat/applications/ktechlab/ktechlab-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg ktechlab
+#
+# spec file for package ktechlab (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
-
-# 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 specific building variables
+%define tde_pkg ktechlab
+%define tde_prefix /opt/trinity
%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}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.3
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Circuit simulator for microcontrollers and electronics [Trinity]
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
-Name: trinity-%{tde_pkg}
-Summary: circuit simulator for microcontrollers and electronics [Trinity]
-Version: 0.3
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-
BuildRequires: gettext
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
%description
KTechlab is a circuit simulator with a nice, clickable and discoverable
@@ -58,10 +83,14 @@ as PIC programming in its own Basic dialect and some form of assembler.
Homepage: http://ktechlab.org/
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -133,5 +162,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.3-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
deleted file mode 100644
index c989e6666..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ktechlab/icons/pics/Makefile.am.ORI 2011-11-25 23:54:18.306754485 +0100
-+++ ktechlab/icons/pics/Makefile.am 2011-11-25 23:54:32.547754077 +0100
-@@ -7,8 +7,8 @@
- spdt.png spst.png keypad.png opamp.png xnor.png circuit.png flowcode.png \
- delay.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
- repeat.png while.png for.png assignment.png branch.png delay.png embed.png end.png \
-- for.png interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
-- repeat.png start.png sub.png subcall.png unary.png while.png item.png ic1.png \
-+ interrupt.png pinread.png pinwrite.png portread.png portwrite.png \
-+ repeat.png start.png sub.png subcall.png unary.png item.png ic1.png \
- ic2.png ic3.png voltagesignal.png currentsignal.png clockinput.png cccs.png \
- ccvs.png vcvs.png vccs.png mechanics.png buffer.png external_connection.png \
- logicprobe.png potentiometer.png resistordip.png bidirled.png project_library.png \
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch b/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 5c9ee7e8a..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ktechlab/src/Makefile.am.ORI 2012-08-06 11:04:54.798218350 +0200
-+++ ktechlab/src/Makefile.am 2012-08-06 11:05:01.909069510 +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 $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT)
-+ $(top_builddir)/src/core/libcore.la -lkutils $(LIB_GPSIM) -lktexteditor $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_QT)
-
- # which sources should be compiled for ktechlab
- ktechlab_SOURCES = ktechlab.cpp node.cpp connector.cpp itemlibrary.cpp \
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
deleted file mode 100644
index fd49dd7bc..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/ktechlab-3.5.13.1.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
deleted file mode 100644
index 91af2d22a..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.1.spec
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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} || 0%{?pclinuxos}
-%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 release 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 release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Fix list of icons to install [Bug #990]
diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.spec
deleted file mode 100644
index 3f582d2f9..000000000
--- a/redhat/applications/ktechlab/ktechlab-3.5.13.spec
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%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: 2%{?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.tar.gz
-
-# [ktechlab] Fix list of icons to install [Bug #990]
-Patch0: ktechlab-3.5.13-duplicate_icons.patch
-# [ktechlab] Missing LDFLAGS cause FTBFS
-Patch1: ktechlab-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-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/
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%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/qt.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
-* 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 release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-- Fix list of icons to install [Bug #990]