From f01a421b4fe4d008074832708f24472aa857a48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 22 Apr 2015 22:07:38 +0200 Subject: RPM packaging: update ksplash-engine-moodin, ksquirrel, kstreamripper, ksystemlog, ktechlab --- .../ksplash-engine-moodin-14.0.0.spec | 89 ++++++++---- .../ksplash-engine-moodin-3.5.13.1.spec | 134 ------------------ .../ksplash-engine-moodin-3.5.13.spec | 126 ----------------- .../applications/ksquirrel/ksquirrel-14.0.0.spec | 115 ++++++++++----- .../applications/ksquirrel/ksquirrel-3.5.13.1.spec | 154 --------------------- .../applications/ksquirrel/ksquirrel-3.5.13.spec | 146 ------------------- .../kstreamripper/kstreamripper-14.0.0.spec | 100 ++++++++----- .../kstreamripper-3.5.13-fix_doc_directory.patch | 9 -- .../kstreamripper-3.5.13-missing_include_tqt.patch | 10 -- .../kstreamripper-3.5.13-missing_ldflags.patch | 11 -- .../kstreamripper/kstreamripper-3.5.13.1.spec | 129 ----------------- .../kstreamripper/kstreamripper-3.5.13.spec | 125 ----------------- .../applications/ksystemlog/ksystemlog-14.0.0.spec | 100 ++++++++----- .../ksystemlog/ksystemlog-3.5.13.1.spec | 134 ------------------ .../applications/ksystemlog/ksystemlog-3.5.13.spec | 126 ----------------- redhat/applications/ktechlab/ktechlab-14.0.0.spec | 89 ++++++++---- .../ktechlab/ktechlab-3.5.13-duplicate_icons.patch | 13 -- .../ktechlab/ktechlab-3.5.13-missing_ldflags.patch | 11 -- .../ktechlab-3.5.13.1-remove_gpsim_link.patch | 11 -- .../applications/ktechlab/ktechlab-3.5.13.1.spec | 145 ------------------- redhat/applications/ktechlab/ktechlab-3.5.13.spec | 140 ------------------- 21 files changed, 335 insertions(+), 1582 deletions(-) delete mode 100644 redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec delete mode 100644 redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec delete mode 100644 redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec delete mode 100644 redhat/applications/ksquirrel/ksquirrel-3.5.13.spec delete mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch delete mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch delete mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch delete mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec delete mode 100644 redhat/applications/kstreamripper/kstreamripper-3.5.13.spec delete mode 100644 redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec delete mode 100644 redhat/applications/ksystemlog/ksystemlog-3.5.13.spec delete mode 100644 redhat/applications/ktechlab/ktechlab-3.5.13-duplicate_icons.patch delete mode 100644 redhat/applications/ktechlab/ktechlab-3.5.13-missing_ldflags.patch delete mode 100644 redhat/applications/ktechlab/ktechlab-3.5.13.1-remove_gpsim_link.patch delete mode 100644 redhat/applications/ktechlab/ktechlab-3.5.13.1.spec delete mode 100644 redhat/applications/ktechlab/ktechlab-3.5.13.spec (limited to 'redhat') diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec index 009c46c45..ded26ca36 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-14.0.0.spec @@ -1,54 +1,79 @@ -# Default version for this component -%define tde_pkg ksplash-engine-moodin +# +# spec file for package ksplash-engine-moodin (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 ksplash-engine-moodin +%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.4.2 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Fading splash screen engine for Trinity +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: fading splash screen engine for Trinity -Version: 0.4.2 -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 -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot -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 Heavily customizable engine for various types of themes. @@ -68,10 +93,14 @@ engine by Sean Meiners Homepage: http://moodwrod.com -%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}} @@ -125,5 +154,5 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Jul 05 2013 Francois Andriot - 0.4.2-6 +* Fri Jul 05 2013 Francois Andriot - 2:0.4.2-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec deleted file mode 100644 index 97dc989ad..000000000 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.1.spec +++ /dev/null @@ -1,134 +0,0 @@ -# Default version for this component -%define kdecomp ksplash-engine-moodin - -# 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: fading splash screen engine for Trinity -Version: 0.4.2 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -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 - -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 -Heavily customizable engine for various types of themes. - -Features: -* scale cache -* fading images -* use current icon set or custom images -* unlimited Custom text labels -* set fading delay and length -* custom image arrangement -* resolution independent themes - -This TDE splash screen engine is based upon Linspire's -engine by Sean Meiners - -Homepage: http://moodwrod.com - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/ksplashmoodin.la -%{tde_tdelibdir}/ksplashmoodin.so -%{tde_datadir}/apps/ksplash/Themes/FingerPrint/ -%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ -%{tde_datadir}/services/ksplashmoodin.desktop - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.4.2-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot - 0.4.2-2 -- Rebuild for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 0.4.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec deleted file mode 100644 index 0b70d5036..000000000 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define kdecomp ksplash-engine-moodin - -# 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: fading splash screen engine for Trinity -Version: 0.4.2 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - - -%description -Heavily customizable engine for various types of themes. - -Features: -* scale cache -* fading images -* use current icon set or custom images -* unlimited Custom text labels -* set fading delay and length -* custom image arrangement -* resolution independent themes - -This TDE splash screen engine is based upon Linspire's -engine by Sean Meiners - -Homepage: http://moodwrod.com - - -%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|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/ksplashmoodin.la -%{tde_tdelibdir}/ksplashmoodin.so -%{tde_datadir}/apps/ksplash/Themes/FingerPrint/ -%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ -%{tde_datadir}/services/ksplashmoodin.desktop - - -%Changelog -* Wed May 02 2012 Francois Andriot - 0.4.2-2 -- Rebuild for Fedora 17 -- Removes post and postun - -* Sat Nov 19 2011 Francois Andriot - 0.4.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec index 67d287878..051c98789 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec @@ -1,56 +1,97 @@ -# Default version for this component -%define tde_pkg ksquirrel +# +# spec file for package ksquirrel (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 ksquirrel +%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.8.0 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Powerful Trinity image viewer +Group: Amusements/Games +URL: http://www.trinitydesktop.org/ -Name: trinity-%{tde_pkg} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot -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: trinity-libkipi-devel BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel + +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 + +# MESA support +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: mesaglu-devel +%endif +%if 0%{?suse_version} +BuildRequires: Mesa-libGL-devel +BuildRequires: Mesa-libGLU-devel +%endif +%if 0%{?rhel} == 4 +BuildRequires: xorg-x11-Mesa-libGLU +%endif + %description KSquirrel is an image viewer for TDE with disk navigator, file tree, @@ -61,10 +102,14 @@ KSquirrel is a fast and convenient image viewer for TDE featuring OpenGL and dynamic format support. -%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}} @@ -116,12 +161,12 @@ export PATH="%{tde_bindir}:${PATH}" %post -update-desktop-database %{tde_appdir} > /dev/null +update-desktop-database %{tde_tdeappdir} > /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 +update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : @@ -135,10 +180,12 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/libksquirrelpart.la %{tde_tdelibdir}/libksquirrelpart.so %{tde_tdeappdir}/ksquirrel.desktop +%dir %{tde_datadir}/apps/dolphin +%dir %{tde_datadir}/apps/dolphin/servicemenus %{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc +%{tde_datadir}/apps/ksquirrelpart/ %{tde_datadir}/config/magic/x-ras.magic %{tde_datadir}/config/magic/x-sun.magic %{tde_datadir}/config/magic/x-utah.magic @@ -150,5 +197,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_mandir}/man1/ksquirrel.1 %changelog -* Fri Jul 05 2013 Francois Andriot - 0.8.0-6 +* Fri Jul 05 2013 Francois Andriot - 2:0.8.0-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec deleted file mode 100644 index 7a27d58d9..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.1.spec +++ /dev/null @@ -1,154 +0,0 @@ -# Default version for this component -%define kdecomp ksquirrel - -# 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: Powerful Trinity image viewer -Version: 0.8.0 -Release: 3%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot -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 - -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: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for KDE featuring -OpenGL and dynamic format support. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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 -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} -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.8.0-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot - 0.8.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot - 0.8.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec deleted file mode 100644 index 60d1484dd..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define kdecomp ksquirrel - -# 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: Powerful Trinity image viewer -Version: 0.8.0 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for KDE featuring -OpenGL and dynamic format support. - - -%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|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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 -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} -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%Changelog -* Wed May 02 2012 Francois Andriot - 0.8.1-2 -- Rebuild for Fedora 17 -- Fix HTML directory location - -* Sun Nov 20 2011 Francois Andriot - 0.8.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec index c32baae1b..8a8ab4481 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec @@ -1,53 +1,78 @@ -# Default version for this component -%define tde_pkg kstreamripper +# +# spec file for package kstreamripper (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 kstreamripper +%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} -Summary: TDE frontend for streamripper +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3.4 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: TDE frontend for streamripper +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -Version: 0.3.4 -Release: %{?!preversion:5}%{?preversion:4_%{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 -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot -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: 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 + BuildRequires: scons @@ -58,10 +83,14 @@ on your harddisk and splits them up in mp3 files. KStreamRipper helps you with managing/ripping your preferred streams. -%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}} @@ -80,6 +109,13 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Move desktop file to XDG folder +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + +# Missing icon file will make this fail. +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %clean %__rm -rf %{buildroot} @@ -88,12 +124,12 @@ export PATH="%{tde_bindir}:${PATH}" %files %defattr(-,root,root,-) %{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc +%{tde_tdeappdir}/kstreamripper.desktop +%{tde_datadir}/apps/kstreamripper/ %{tde_tdedocdir}/HTML/en/kstreamripper/ %changelog -* Fri Jul 05 2013 Francois Andriot - 0.3.4-5 +* Fri Jul 05 2013 Francois Andriot - 2:0.3.4-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch deleted file mode 100644 index c0bf88288..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- kstreamripper/doc/SConscript.ORI 2012-08-06 10:50:27.856547193 +0200 -+++ kstreamripper/doc/SConscript 2012-08-06 10:50:34.599402333 +0200 -@@ -79,5 +79,5 @@ - myenv.KDEinstall( 'KDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' ) - - ## Use processfolder for each documentation directory --processfolder('en/', 'en') -+processfolder('en/', 'en', 'kstreamripper') - diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch deleted file mode 100644 index 5663b1a81..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_include_tqt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kstreamripper/src/addnewstreamimpl.h.ORI 2011-11-02 20:40:17.450317896 +0100 -+++ kstreamripper/src/addnewstreamimpl.h 2011-11-02 20:40:25.777317020 +0100 -@@ -22,6 +22,7 @@ - #define ADDNEWSTREAMIMPL_H - - #include "addnewstream.h" -+#include - - class AddNewStreamImpl : public AddNewStream - { diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch deleted file mode 100644 index dbdaae544..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kstreamripper/src/SConscript.ORI 2012-08-06 10:46:01.509252125 +0200 -+++ kstreamripper/src/SConscript 2012-08-06 10:46:10.021070424 +0200 -@@ -43,7 +43,7 @@ - myenv.KDEaddpaths_includes( ['./', '../'] ) - - ## Necessary libraries to link against --myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui'] ) -+myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui', 'qt-mt'] ) - if env['KDEm2']>3: myenv.KDEaddlibs( ['kdnssd']) - ############################# - ## Data to install diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec deleted file mode 100644 index e76091312..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.1.spec +++ /dev/null @@ -1,129 +0,0 @@ -# Default version for this component -%define kdecomp kstreamripper - -# 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: TDE frontend for streamripper - -Version: 0.3.4 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -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 - -Patch0: kstreamripper-3.5.13-missing_include_tqt.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-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: scons - - -%description -KStreamRipper is a small frontend for the streamripper command -line utility. Streamripper captures internet shoutcast radio streams -on your harddisk and splits them up in mp3 files. KStreamRipper helps -you with managing/ripping your preferred streams. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch0 -p1 - -%__sed -i kde.py \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|include/kde|include/tde|g" - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - - -scons -Q -j4 \ - qtlibs=${QTLIB:-${QTDIR}/%{_lib}} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc -%{tde_tdedocdir}/HTML/en/kstreamripper/ - - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.3.4-2 -- Initial release for TDE 3.5.13.1 - -* Wed Nov 02 2011 Francois Andriot - 0.3.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec deleted file mode 100644 index 792fa0495..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define kdecomp kstreamripper - -# 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: TDE frontend for streamripper - -Version: 0.3.4 -Release: 1%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -Patch0: kstreamripper-3.5.13-missing_include_tqt.patch - -# [kstreamripper] Missing LDFLAGS cause FTBFS on Mageia / Mandriva -Patch1: kstreamripper-3.5.13-missing_ldflags.patch - -# [kstreamripper] Fix directory of HTML documentation -Patch2: kstreamripper-3.5.13-fix_doc_directory.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: scons - - -%description -KStreamRipper is a small frontend for the streamripper command -line utility. Streamripper captures internet shoutcast radio streams -on your harddisk and splits them up in mp3 files. KStreamRipper helps -you with managing/ripping your preferred streams. - - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 -%patch1 -p1 -b .ldflags -%patch2 -p1 -b .doc - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export CXXFLAGS="-I%{tde_includedir}/tqt" - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc -%{tde_tdedocdir}/HTML/en/kstreamripper/ - - - -%Changelog -* Wed Nov 02 2011 Francois Andriot - 0.3.4-1 -- Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec index b7a520096..d7dfcb6d4 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec @@ -1,53 +1,78 @@ -# Default version for this component -%define tde_pkg ksystemlog +# +# spec file for package ksystemlog (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 ksystemlog +%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} -Summary: system log viewer tool for Trinity -Version: 0.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.3.2 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: System log viewer tool for Trinity +Group: Applications/System +URL: http://ksystemlog.forum-software.org -License: GPLv2+ -Group: Applications/System +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://ksystemlog.forum-software.org +#Vendor: Trinity Desktop +#Packager: Francois Andriot -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: 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 ksystemlog is a system log viewer tool for Trinity. @@ -58,10 +83,14 @@ their computer. But it is also designed for advanced users, who want to quickly see problems occuring on their server. -%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}} @@ -100,6 +129,13 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} +# Move desktop file to XDG folder +%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" +%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + +# Missing category will make this fail. +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %clean %__rm -rf %{buildroot} @@ -118,13 +154,13 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/ksystemlog -%{tde_datadir}/applnk/Utilities/ksystemlog.desktop -%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc +%{tde_tdeappdir}/ksystemlog.desktop +%{tde_datadir}/apps/ksystemlog/ %{tde_datadir}/config.kcfg/ksystemlog.kcfg %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png %{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz %{tde_tdedocdir}/HTML/en/ksystemlog/ %changelog -* Fri Jul 05 2013 Francois Andriot - 0.3.2-5 +* Fri Jul 05 2013 Francois Andriot - 2:0.3.2-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec deleted file mode 100644 index f2b6ace79..000000000 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.1.spec +++ /dev/null @@ -1,134 +0,0 @@ -# Default version for this component -%define kdecomp ksystemlog - -# 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: system log viewer tool for Trinity -Version: 0.3.2 -Release: 2%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://ksystemlog.forum-software.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - - -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 - - -%description -ksystemlog is a system log viewer tool for Trinity. - -This program is developed for being used by beginner users, which don't know -how to find information about their Linux system, and how the log files are in -their computer. But it is also designed for advanced users, who want to -quickly see problems occuring on their server. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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 \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -%{tde_bindir}/ksystemlog -%{tde_datadir}/applnk/Utilities/ksystemlog.desktop -%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc -%{tde_datadir}/config.kcfg/ksystemlog.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz - - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.3.2-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot - 0.3.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec deleted file mode 100644 index 6b8f7aaeb..000000000 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define kdecomp ksystemlog - -# 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: system log viewer tool for Trinity -Version: 0.3.2 -Release: 1%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://ksystemlog.forum-software.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - - -%description -ksystemlog is a system log viewer tool for Trinity. - -This program is developed for being used by beginner users, which don't know -how to find information about their Linux system, and how the log files are in -their computer. But it is also designed for advanced users, who want to -quickly see problems occuring on their server. - - -%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|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/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 \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%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 -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -%{tde_bindir}/ksystemlog -%{tde_datadir}/applnk/Utilities/ksystemlog.desktop -%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc -%{tde_datadir}/config.kcfg/ksystemlog.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz - - -%Changelog -* Sat Dec 03 2011 Francois Andriot - 0.3.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - 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 -URL: http://www.trinitydesktop.org/ +#Vendor: Trinity Desktop +#Packager: Francois Andriot -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 - 0.3-6 +* Fri Jul 05 2013 Francois Andriot - 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 -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 - 0.3-3 -- Initial release for TDE 3.5.13.1 - -* Fri Nov 25 2011 Francois Andriot - 0.3-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot - 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 -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 - 0.3-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot - 0.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- Fix list of icons to install [Bug #990] -- cgit v1.2.1