RHEL/Fedora: add support for MGA2/MDV2011 in many applications

2 files changed, 60 insertions, 30 deletions

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
new file mode 100644
index 000000000..fa2f57859
--- /dev/null
+++ b/redhat/applications/kpicosim/kpicosim-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,11 @@
+--- 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/trinity-kpicosim.spec b/redhat/applications/kpicosim/trinity-kpicosim.spec
index e6fcf0466..43c024ed5 100644
--- a/redhat/applications/kpicosim/trinity-kpicosim.spec
+++ b/redhat/applications/kpicosim/trinity-kpicosim.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kpicosim
-%define version 0.6a
-%define release 1
 
 # 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
 %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_docdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.6a
+Release:	1%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,14 +35,17 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 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
 
+# [kpicosim] Fix "not a string literal" error
+Patch1:		kpicosim-3.5.13-fix_not_a_string_literal_error.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
 
@@ -49,12 +59,13 @@ 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|%{_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 "/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"
@@ -62,19 +73,27 @@ simulator and export functions to VHDL, HEX and MEM files.
 
 
 %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:%{tde_includedir}
+  --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="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -88,23 +107,23 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+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
-%{_bindir}/kpicosim
-%{_datadir}/applnk/Development/kpicosim.desktop
-%{_datadir}/apps/katepart/syntax/psm.xml
-%{_datadir}/apps/kpicosim
-%{tde_docdir}/HTML/en/kpicosim
-%{_datadir}/icons/hicolor/*/apps/kpicosim.png
+%{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