RPM Packaging: update mplayerthumbs, piklab, potracegui, qt4-tqt-theme-engine, rosegarden

5 files changed, 72 insertions, 386 deletions

diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab-14.0.0.spec
index 55153629e..e044df23c 100644
--- a/redhat/applications/piklab/piklab-14.0.0.spec
+++ b/redhat/applications/piklab/piklab-14.0.0.spec
@@ -1,55 +1,91 @@
-# Default version for this component
-%define tde_pkg piklab
+#
+# spec file for package piklab (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 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_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_tdedocdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		IDE for PIC-microcontroller development [Trinity]
-Version:		0.15.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.15.2
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	IDE for PIC-microcontroller development [Trinity]
+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 <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
+
+# 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.
@@ -60,10 +96,14 @@ 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}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -113,12 +153,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 || :
 
@@ -145,5 +185,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.15.2-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.15.2-1
 - Initial release for TDE 14.0.0
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; i<nb; i++) if ( !this->at(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<DataType *> list;
-     for (it=_map.begin(); it!=_map.end(); ++it)
-       list.append(const_cast<DataType *>(static_cast<const DataType *>(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<DataType *> list = fromCppString(dataStream(), dataSize());
-+    TQValueList<DataType *> list = this->fromCppString(dataStream(), dataSize());
-     for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), 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 <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
-
-# [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 <francois.andriot@free.fr> - 0.15.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Apr 06 2012 Francois Andriot <francois.andriot@free.fr> - 0.15.2-3
-- Fix MAN directory location
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 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.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 <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
-
-# [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 <francois.andriot@free.fr> - 0.15.2-3
-- Fix MAN directory location
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.15.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16