diff --git a/redhat/applications/abakus/abakus-0.91-link-dcop.patch b/redhat/applications/abakus/abakus-0.91-link-dcop.patch deleted file mode 100644 index f1dc37127..000000000 --- a/redhat/applications/abakus/abakus-0.91-link-dcop.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rcb abakus.ORI/src/SConscript abakus/src/SConscript -*** abakus.ORI/src/SConscript 2011-09-14 21:44:42.191599072 +0200 ---- abakus/src/SConscript 2011-09-14 21:44:51.352602708 +0200 -*************** -*** 66,72 **** - myenv.KDEaddpaths_includes('#/src/ #/') - - ## Necessary libraries to link against -! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui' ) - - ############################# - ## Data to install ---- 66,72 ---- - myenv.KDEaddpaths_includes('#/src/ #/') - - ## Necessary libraries to link against -! myenv.KDEaddlibs( 'qt-mt kio kdecore kdeprint kdeui DCOP' ) - - ############################# - ## Data to install diff --git a/redhat/applications/abakus/abakus-14.0.0.spec b/redhat/applications/abakus/abakus-14.0.0.spec index e8a003bc8..e08d8bda0 100644 --- a/redhat/applications/abakus/abakus-14.0.0.spec +++ b/redhat/applications/abakus/abakus-14.0.0.spec @@ -1,51 +1,66 @@ -# Default version for this component -%define tde_pkg abakus +# +# spec file for package abakus (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 abakus +%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_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: Calculator for TDE -Version: 0.91 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.91 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Calculator for TDE +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ -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 +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: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + BuildRequires: bison %description @@ -56,7 +71,7 @@ It also gives information about mathematical variables and has the user-friendly menu options of a normal TDE application. -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %debug_package %endif @@ -126,5 +141,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/applnk/Utilities/abakus.desktop %changelog -* Fri Jul 05 2013 Francois Andriot - 0.91-7 +* Fri Jul 05 2013 Francois Andriot - 2:0.91-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/abakus/abakus-3.5.12.spec b/redhat/applications/abakus/abakus-3.5.12.spec deleted file mode 100644 index 91d7f27cd..000000000 --- a/redhat/applications/abakus/abakus-3.5.12.spec +++ /dev/null @@ -1,93 +0,0 @@ -# Default version for this component -%define kdecomp abakus -%define version 0.91 -%define release 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 - - -Name: trinity-%{kdecomp} -Summary: Calculator for TDE -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Source0: %{kdecomp}-3.5.12.tar.gz - -Patch0: abakus-0.91-link-dcop.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: scons - -%description -AbaKus is a complex calculator, which provides -many different kinds of calculations. -Think of it as bc (the command-line calculator) with a nice GUI. -It also gives information about mathematical variables and -has the user-friendly menu options of a normal KDE application. - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 - -%build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export CXXFLAGS="-I%{_includedir}/tqt" - -./configure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot}%{_prefix} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{_bindir}/* -%{_datadir}/apps/*/ -%{_datadir}/icons/*/*/*/* -%{tde_docdir}/HTML/*/*/ -%{_datadir}/applnk/Utilities/abakus.desktop - -%changelog -* Tue Sep 14 2011 Francois Andriot - 0.91-1 -- Initial release for RHEL 6 and Fedora 15 -- Import to GIT diff --git a/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch b/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch deleted file mode 100644 index 994fb39d5..000000000 --- a/redhat/applications/abakus/abakus-3.5.13.1-fix_install_icon.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- abakus-3.5.13.1/CMakeLists.txt.ORI 2012-10-02 19:34:14.633927133 +0000 -+++ abakus-3.5.13.1/CMakeLists.txt 2012-10-02 19:34:25.560708663 +0000 -@@ -66,6 +66,7 @@ - - ##### source directories ######################## - -+add_subdirectory( icons ) - add_subdirectory( src ) - tde_conditional_add_subdirectory( BUILD_DOC doc ) - tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) diff --git a/redhat/applications/abakus/abakus-3.5.13.1.spec b/redhat/applications/abakus/abakus-3.5.13.1.spec deleted file mode 100644 index 3a5e75aad..000000000 --- a/redhat/applications/abakus/abakus-3.5.13.1.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define kdecomp abakus - -# 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_tdeappdir %{tde_datadir}/applications/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: Calculator for TDE -Version: 0.91 -Release: 4%{?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 - -# [abakus] Fix install icon -Patch1: abakus-3.5.13.1-fix_install_icon.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: desktop-file-utils -BuildRequires: cmake >= 2.8 -BuildRequires: bison - -%description -AbaKus is a complex calculator, which provides -many different kinds of calculations. -Think of it as bc (the command-line calculator) with a nice GUI. -It also gives information about mathematical variables and -has the user-friendly menu options of a normal TDE application. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 -b .icon - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%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 COPYING -%{tde_bindir}/abakus -%{tde_datadir}/apps/abakus/ -%{tde_datadir}/icons/hicolor/*/apps/abakus.png -%{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop - -%changelog -* Tue Oct 02 2012 Francois Andriot - 0.91-4 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/applications/abakus/abakus-3.5.13.spec b/redhat/applications/abakus/abakus-3.5.13.spec deleted file mode 100644 index b0a33e2cc..000000000 --- a/redhat/applications/abakus/abakus-3.5.13.spec +++ /dev/null @@ -1,107 +0,0 @@ -# Default version for this component -%define kdecomp abakus - -# 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_tdeappdir %{tde_datadir}/applications/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: Calculator for TDE -Version: 0.91 -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.tar.gz - -BuildRequires: tqtinterface-devel >= 3.5.13 -BuildRequires: trinity-tdelibs-devel >= 3.5.13 -BuildRequires: trinity-tdebase-devel >= 3.5.13 -BuildRequires: desktop-file-utils -BuildRequires: scons -BuildRequires: bison - -%description -AbaKus is a complex calculator, which provides -many different kinds of calculations. -Think of it as bc (the command-line calculator) with a nice GUI. -It also gives information about mathematical variables and -has the user-friendly menu options of a normal TDE application. - -%prep -%setup -q -n applications/%{kdecomp} - -%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" - -# We are using a specific (non-autotool) configure script. -./configure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot}%{tde_prefix} - - -%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 COPYING -%{tde_bindir}/abakus -%{tde_datadir}/apps/abakus/ -%{tde_datadir}/icons/hicolor/*/apps/abakus.png -%{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop - -%changelog -* Wed Apr 25 2012 Francois Andriot - 0.91-3 -- Fix postinstall - -* Sun Oct 30 2011 Francois Andriot - 0.91-2 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot - 0.91-1 -- Initial release for RHEL 6 and Fedora 15 -- Import to GIT