From 6581dc50b83f203d65eac61c00a159ab2a6ddb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 14:34:02 +0100 Subject: RPM: massive update and cleanup --- redhat/applications/piklab/piklab-14.0.0.spec | 189 ------------------------ redhat/applications/piklab/piklab-3.5.13.2.spec | 145 ------------------ redhat/applications/piklab/piklab.spec | 189 ++++++++++++++++++++++++ 3 files changed, 189 insertions(+), 334 deletions(-) delete mode 100644 redhat/applications/piklab/piklab-14.0.0.spec delete mode 100644 redhat/applications/piklab/piklab-3.5.13.2.spec create mode 100644 redhat/applications/piklab/piklab.spec (limited to 'redhat/applications/piklab') diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec deleted file mode 100644 index 7bcffe525..000000000 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ /dev/null @@ -1,189 +0,0 @@ -# -# spec file for package piklab (version R14) -# -# 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 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg piklab -%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 - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.15.2 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: IDE for PIC-microcontroller development [Trinity] -Group: Applications/Utilities -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -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 - -# READLINE support -BuildRequires: readline-devel - -# LIBUSB support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}usb1.0-devel -BuildRequires: %{_lib}usb-compat0.1-devel -%else -BuildRequires: libusb-devel -%endif - - -%description -Piklab is an integrated development environment for applications based on -Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. - -Support for several compiler and assembler toolchains is integrated. The -GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and -PICkit2 programmers, the PicStart+ programmer, and most direct programmers -are supported. A command-line programmer and debugger are also available. - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif - -%__make %{?_smp_mflags} - -%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 -touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" -%endif - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/piklab -%{tde_bindir}/piklab-coff -%{tde_bindir}/piklab-hex -%{tde_bindir}/piklab-prog -%{tde_tdeappdir}/piklab.desktop -%{tde_datadir}/apps/katepart/syntax/asm-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-pic.xml -%{tde_datadir}/apps/katepart/syntax/jal-pic.xml -%{tde_datadir}/apps/piklab -%{tde_tdedocdir}/HTML/en/piklab -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-piklab.desktop -%{tde_mandir}/man1/piklab-coff.1 -%{tde_mandir}/man1/piklab-hex.1 -%{tde_mandir}/man1/piklab-prog.1 -%{tde_mandir}/man1/piklab.1 - - -%changelog diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec deleted file mode 100644 index 425bb42a5..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg piklab -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -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: %{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: readline-devel - -%description -Piklab is an integrated development environment for applications based on -Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. - -Support for several compiler and assembler toolchains is integrated. The -GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and -PICkit2 programmers, the PicStart+ programmer, and most direct programmers -are supported. A command-line programmer and debugger are also available. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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}" - -# Warning: --enable-final causes FTBFS -# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - -%find_lang %{tde_pkg} - -%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 %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/piklab -%{tde_bindir}/piklab-coff -%{tde_bindir}/piklab-hex -%{tde_bindir}/piklab-prog -%{tde_tdeappdir}/piklab.desktop -%{tde_datadir}/apps/katepart/syntax/asm-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-pic.xml -%{tde_datadir}/apps/katepart/syntax/jal-pic.xml -%{tde_datadir}/apps/piklab -%{tde_tdedocdir}/HTML/en/piklab -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-piklab.desktop -%{tde_mandir}/man1/piklab-coff.1 -%{tde_mandir}/man1/piklab-hex.1 -%{tde_mandir}/man1/piklab-prog.1 -%{tde_mandir}/man1/piklab.1 - - -%changelog diff --git a/redhat/applications/piklab/piklab.spec b/redhat/applications/piklab/piklab.spec new file mode 100644 index 000000000..ff8d574d2 --- /dev/null +++ b/redhat/applications/piklab/piklab.spec @@ -0,0 +1,189 @@ +# +# spec file for package piklab (version R14) +# +# 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 +%if "%{?tde_version}" == "" +%define tde_version 14.1.0 +%endif +%define tde_pkg piklab +%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 + + +Name: trinity-%{tde_pkg} +Epoch: %{tde_epoch} +Version: 0.15.2 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: IDE for PIC-microcontroller development [Trinity] +Group: Applications/Utilities +URL: http://www.trinitydesktop.org/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +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 + +# READLINE support +BuildRequires: readline-devel + +# LIBUSB support +%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +BuildRequires: %{_lib}usb1.0-devel +BuildRequires: %{_lib}usb-compat0.1-devel +%else +BuildRequires: libusb-devel +%endif + + +%description +Piklab is an integrated development environment for applications based on +Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. + +Support for several compiler and assembler toolchains is integrated. The +GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and +PICkit2 programmers, the PicStart+ programmer, and most direct programmers +are supported. A command-line programmer and debugger are also available. + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" + +# Warning: --enable-final causes FTBFS +# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-final \ + --enable-new-ldflags \ + --enable-closure \ + --enable-rpath \ + --disable-gcc-hidden-visibility \ +%if 0%{?rhel} == 5 + --disable-libreadline \ +%endif + +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif + +%__make %{?_smp_mflags} + +%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018 +touch "src/devices/pic/xml_data/Makefile.in" "src/devices/mem24/xml_data/Makefile.in" +%endif + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# Incorrect extension on manpage +%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 + +%find_lang %{tde_pkg} + +%clean +%__rm -rf %{buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%{tde_bindir}/piklab +%{tde_bindir}/piklab-coff +%{tde_bindir}/piklab-hex +%{tde_bindir}/piklab-prog +%{tde_tdeappdir}/piklab.desktop +%{tde_datadir}/apps/katepart/syntax/asm-pic.xml +%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml +%{tde_datadir}/apps/katepart/syntax/coff-pic.xml +%{tde_datadir}/apps/katepart/syntax/jal-pic.xml +%{tde_datadir}/apps/piklab +%{tde_tdedocdir}/HTML/en/piklab +%{tde_datadir}/icons/hicolor/*/*/*.png +%{tde_datadir}/mimelnk/application/x-piklab.desktop +%{tde_mandir}/man1/piklab-coff.1 +%{tde_mandir}/man1/piklab-hex.1 +%{tde_mandir}/man1/piklab-prog.1 +%{tde_mandir}/man1/piklab.1 + + +%changelog -- cgit v1.2.3