From c3350bda33cd4e47c3d13eb7c9dcea757b2a5ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 3 Nov 2019 10:14:46 +0100 Subject: RPM: remove lots of obsolete 3.5.13.x files --- .../piklab-3.5.13-fix_gcc47_compilation.patch | 33 ----- .../piklab/piklab-3.5.13.1-remove_gui_dir.patch | 7 - redhat/applications/piklab/piklab-3.5.13.1.spec | 161 --------------------- redhat/applications/piklab/piklab-3.5.13.2.spec | 145 ------------------- redhat/applications/piklab/piklab-3.5.13.spec | 153 -------------------- 5 files changed, 499 deletions(-) delete mode 100644 redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch delete mode 100644 redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch delete mode 100644 redhat/applications/piklab/piklab-3.5.13.1.spec delete mode 100644 redhat/applications/piklab/piklab-3.5.13.2.spec delete mode 100644 redhat/applications/piklab/piklab-3.5.13.spec (limited to 'redhat/applications/piklab') diff --git a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch deleted file mode 100644 index 9b3adfbce..000000000 --- a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- piklab/src/common/common/range.h.ORI 2012-05-06 11:39:36.080834047 +0200 -+++ piklab/src/common/common/range.h 2012-05-06 11:39:43.239684938 +0200 -@@ -43,7 +43,7 @@ - { - public: - GenericRangeVector() {} -- GenericRangeVector(const RangeType &range) { append(range); } -+ GenericRangeVector(const RangeType &range) { this->append(range); } - bool isEmpty() const { - uint nb = this->count(); - for (uint i=0; iat(i).isEmpty() ) return false; ---- piklab/src/xml_to_data/device_xml_to_data.h.ORI 2012-05-06 11:45:56.824911257 +0200 -+++ piklab/src/xml_to_data/device_xml_to_data.h 2012-05-06 11:46:04.135759246 +0200 -@@ -76,7 +76,7 @@ - TQValueList list; - for (it=_map.begin(); it!=_map.end(); ++it) - list.append(const_cast(static_cast(it.data()))); -- uint size = toCppString(list, ts); -+ uint size = this->toCppString(list, ts); - ts << ";" << endl; - ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl; - file.close(); ---- piklab/src/devices/base/device_group.h.ORI 2012-05-06 11:47:08.950411718 +0200 -+++ piklab/src/devices/base/device_group.h 2012-05-06 11:47:17.607231757 +0200 -@@ -52,7 +52,7 @@ - { - protected: - virtual void initSupported() { -- TQValueList list = fromCppString(dataStream(), dataSize()); -+ TQValueList list = this->fromCppString(dataStream(), dataSize()); - for (uint i=0; iname(), list[i], ::Group::Support::Tested); - } - virtual uint dataSize() const = 0; diff --git a/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch b/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch deleted file mode 100644 index b549b225b..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.1-remove_gui_dir.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- piklab-3.5.13.1/src/progs/sdcdb/Makefile.am.ORI 2012-10-04 22:23:26.210470311 +0200 -+++ piklab-3.5.13.1/src/progs/sdcdb/Makefile.am 2012-10-04 22:23:30.531371664 +0200 -@@ -1,3 +1,3 @@ - INCLUDES = -I$(top_srcdir)/src $(all_includes) - METASOURCES = AUTO --SUBDIRS = base gui -+SUBDIRS = base diff --git a/redhat/applications/piklab/piklab-3.5.13.1.spec b/redhat/applications/piklab/piklab-3.5.13.1.spec deleted file mode 100644 index fa08d970e..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.1.spec +++ /dev/null @@ -1,161 +0,0 @@ -# Default version for this component -%define kdecomp piklab - -# 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_tdedocdir} - - -Name: trinity-%{kdecomp} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -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 - -# [piklab] Do not build the 'gui' directory -Patch1: piklab-3.5.13.1-remove_gui_dir.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 - -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 %{kdecomp}-3.5.13.1 -%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/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} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - -%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}.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 -* Wed Oct 03 2012 Francois Andriot - 0.15.2-4 -- Initial release for TDE 3.5.13.1 - -* Sun Apr 06 2012 Francois Andriot - 0.15.2-3 -- Fix MAN directory location -- Fix compilation with GCC 4.7 [Bug #958] - -* Fri Nov 25 2011 Francois Andriot - 0.15.2-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot - 0.15.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 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-3.5.13.spec b/redhat/applications/piklab/piklab-3.5.13.spec deleted file mode 100644 index 91aeea1e8..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.spec +++ /dev/null @@ -1,153 +0,0 @@ -# Default version for this component -%define kdecomp piklab - -# 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_tdedocdir} - - -Name: trinity-%{kdecomp} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.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.tar.gz - -# [piklab] Fix compilation with GCC 4.7 [Bug #958] -Patch1: piklab-3.5.13-fix_gcc47_compilation.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -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. - - -%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 -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_includedir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt - -%__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 %{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}.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 -* Sun Apr 06 2012 Francois Andriot - 0.15.2-3 -- Fix MAN directory location -- Fix compilation with GCC 4.7 [Bug #958] - -* Fri Nov 25 2011 Francois Andriot - 0.15.2-2 -- Fix HTML directory location - -* Thu Nov 24 2011 Francois Andriot - 0.15.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.1