From 193ac9dc51fbc8d12aa48fe1191c8512850cc4ff Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 9 Aug 2012 12:02:10 +0200 Subject: RHEL/Fedora: add support for MGA2/MDV2011 in many applications --- redhat/applications/piklab/trinity-piklab.spec | 102 ++++++++++++++----------- 1 file changed, 59 insertions(+), 43 deletions(-) (limited to 'redhat/applications/piklab') diff --git a/redhat/applications/piklab/trinity-piklab.spec b/redhat/applications/piklab/trinity-piklab.spec index f1ccb45be..93fd28370 100644 --- a/redhat/applications/piklab/trinity-piklab.spec +++ b/redhat/applications/piklab/trinity-piklab.spec @@ -1,26 +1,32 @@ # Default version for this component %define kdecomp piklab -%define version 0.15.2 -%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc -%define _mandir %{_datadir}/man %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/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}/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: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.15.2 +Release: 3%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -29,7 +35,7 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz @@ -38,8 +44,8 @@ Source0: %{kdecomp}-3.5.13.tar.gz Patch1: piklab-3.5.13-fix_gcc47_compilation.patch BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -62,8 +68,8 @@ are supported. A command-line programmer and debugger are also available. # 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|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -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" @@ -71,23 +77,31 @@ are supported. A command-line programmer and debugger are also available. %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --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="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} # Incorrect extension on manpage -%__mv -f %{buildroot}%{_mandir}/man1/piklab.1x %{buildroot}%{_mandir}/man1/piklab.1 +%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 %find_lang %{kdecomp} @@ -96,33 +110,35 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} > /dev/null +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +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,-) -%{_bindir}/piklab -%{_bindir}/piklab-coff -%{_bindir}/piklab-hex -%{_bindir}/piklab-prog -%{_datadir}/applications/kde/piklab.desktop -%{_datadir}/apps/katepart/syntax/asm-pic.xml -%{_datadir}/apps/katepart/syntax/coff-c-pic.xml -%{_datadir}/apps/katepart/syntax/coff-pic.xml -%{_datadir}/apps/katepart/syntax/jal-pic.xml -%{_datadir}/apps/piklab -%{tde_docdir}/HTML/en/piklab -%{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/mimelnk/application/x-piklab.desktop -%{_mandir}/man1/piklab-coff.1 -%{_mandir}/man1/piklab-hex.1 -%{_mandir}/man1/piklab-prog.1 -%{_mandir}/man1/piklab.1 +%{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.1