summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kpicosim
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-20 21:03:08 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-20 21:03:08 +0200
commit985dc0e053e528b7c9ecb44a5e4ed5b781eeb72a (patch)
treeed5f9c4bffc437796007287399088d2c9bb6f231 /redhat/applications/kpicosim
parent47b9cb5f610258da5818461ffcb4b97cfacd649b (diff)
downloadtde-packaging-985dc0e053e528b7c9ecb44a5e4ed5b781eeb72a.tar.gz
tde-packaging-985dc0e053e528b7c9ecb44a5e4ed5b781eeb72a.zip
RPM packaging: update kpicosim, kpilot, kpowersave, krecipes, krename
Diffstat (limited to 'redhat/applications/kpicosim')
-rw-r--r--redhat/applications/kpicosim/kpicosim-14.0.0.spec90
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch11
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.1.spec135
-rw-r--r--redhat/applications/kpicosim/kpicosim-3.5.13.spec131
4 files changed, 59 insertions, 308 deletions
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
index 353c86aac..ee3310dca 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim-14.0.0.spec
@@ -1,54 +1,79 @@
-# Default version for this component
-%define tde_pkg kpicosim
+#
+# spec file for package kpicosim (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 kpicosim
+%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.6a
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org
-Name: trinity-%{tde_pkg}
-Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version: 0.6a
-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 <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
kpicosim is a development environment for the Xilinx
@@ -57,10 +82,14 @@ The environment has an editor with syntax highlighting, compiler,
simulator and export functions to VHDL, HEX and MEM files.
-%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}}
@@ -73,7 +102,6 @@ simulator and export functions to VHDL, HEX and MEM files.
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Warning: --enable-final causes FTBFS
%configure \
@@ -128,5 +156,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6a-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6a-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
deleted file mode 100644
index fa2f57859..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpicosim/src/cassembler.cpp.ORI 2012-08-05 23:39:09.061007283 +0200
-+++ kpicosim/src/cassembler.cpp 2012-08-05 23:42:53.639017712 +0200
-@@ -575,7 +575,7 @@
- for( j = 31 ; j >= 0 ; j-- )
- fprintf( outfile, "%02X", INITP[ j ][ line ] ) ;
- } else if ( strcmp( "name", varname ) == 0 ) {
-- fprintf( outfile, entityName.c_str() ) ;
-+ fprintf( outfile, "%s", entityName.c_str() ) ;
- } else if ( strcmp( "begin template", varname ) == 0 ) {
- copy = true ;
- }
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
deleted file mode 100644
index 06140eb27..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.1.spec
+++ /dev/null
@@ -1,135 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# 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: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version: 0.6a
-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.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
-kpicosim is a development environment for the Xilinx
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%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:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.6a-2
-- Initial release for TDE 3.5.13.1
-
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.spec
deleted file mode 100644
index 3d7b5f8c3..000000000
--- a/redhat/applications/kpicosim/kpicosim-3.5.13.spec
+++ /dev/null
@@ -1,131 +0,0 @@
-# Default version for this component
-%define kdecomp kpicosim
-
-# 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: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version: 0.6a
-Release: 1%{?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
-
-# [kpicosim] Fix "not a string literal" error
-Patch1: kpicosim-3.5.13-fix_not_a_string_literal_error.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-
-
-%description
-kpicosim is a development environment for the Xilinx
-PicoBlaze-3 soft-core processor for the KDE Desktop (Linux).
-The environment has an editor with syntax highlighting, compiler,
-simulator and export functions to VHDL, HEX and MEM files.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%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 "/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:%{tde_tdeincludedir}
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
-
-
-
-%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,-)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{tde_bindir}/kpicosim
-%{tde_datadir}/applnk/Development/kpicosim.desktop
-%{tde_datadir}/apps/katepart/syntax/psm.xml
-%{tde_datadir}/apps/kpicosim
-%{tde_tdedocdir}/HTML/en/kpicosim
-%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
-
-
-%Changelog
-* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6a-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16