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

3 files changed, 103 insertions, 115 deletions

diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..5e93fd7d8
--- /dev/null
+++ b/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,31 @@
+--- tellico/src/translators/btparse/bibtex_ast.c.ORI	2012-08-06 15:44:03.978791275 +0200
++++ tellico/src/translators/btparse/bibtex_ast.c	2012-08-06 15:44:23.449376138 +0200
+@@ -57,7 +57,7 @@
+ void dump_ast (char *msg, AST *root)
+ {
+    if (msg != NULL)
+-      printf (msg);
++      printf ("%s", msg);
+    dump (root, 0);
+    printf ("\n");
+ }
+--- tellico/src/translators/btparse/error.c.ORI	2012-08-06 15:44:38.954046066 +0200
++++ tellico/src/translators/btparse/error.c	2012-08-06 15:45:08.152425553 +0200
+@@ -88,7 +88,7 @@
+ 
+    if (err->filename)
+    {
+-      fprintf (stderr, err->filename);
++      fprintf (stderr, "%s", err->filename);
+       something_printed = TRUE;
+    }
+    if (err->line > 0)                   /* going to print a line number? */
+@@ -111,7 +111,7 @@
+    {
+       if (something_printed)
+          fprintf (stderr, ", ");
+-      fprintf (stderr, name);
++      fprintf (stderr, "%s", name);
+       something_printed = TRUE;
+    }
+ 
diff --git a/redhat/applications/tellico/tellico.xpm b/redhat/applications/tellico/tellico.xpm
deleted file mode 100644
index 589d66eeb..000000000
--- a/redhat/applications/tellico/tellico.xpm
+++ /dev/null
@@ -1,62 +0,0 @@
-/* XPM */
-static char *tellico[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 24 1",
-"  c #000404",
-". c #062625",
-"X c #01354A",
-"o c #165536",
-"O c #1C6056",
-"+ c #5E0507",
-"@ c #52545F",
-"# c #1E5F9D",
-"$ c #2B7ACF",
-"% c #57B35E",
-"& c #288FF2",
-"* c #3486D1",
-"= c #67ADB3",
-"- c #A12223",
-"; c #FD7070",
-": c #E35555",
-"> c #B84A4A",
-", c #90F592",
-"< c #FA8B8C",
-"1 c #DC9F9F",
-"2 c #FEFEFE",
-"3 c #D6D8D4",
-"4 c #ABB5B7",
-"5 c None",
-/* pixels */
-"55555555555555555555555555555555",
-"55555555555555555++5555555555555",
-"55555555555555+++:>+++5555555555",
-"55555555555+++><<;;<<>+++5555555",
-"55555555+++><<<<<;;;;;;;>+++5555",
-"55555+++>1<<<<;;;<;;;;:;:;;>+++5",
-"5555 +>1<<<<<<<;;;;;;;:;;;;:;>+ ",
-"5555+-:>><<<<;<;<;;;:;;::;;>>>+ ",
-"5555+>;;:--:;<;<;;;;;;;::><22>  ",
-"5555+:<;;;;:>-><<;;:::><222221  ",
-"5555+><<<<;;;::->>::;32222222>+5",
-"55XXX-;;<<<<<;;;:-322222222221+ ",
-"XX*==-::;;;<<<<<;>22222222231-+ ",
-"XO##*&@+->::;<;<<>2222222;>++   ",
-"X#&&$##*#@--::;;<>2223<--++    5",
-"X&&&&&$$##*#@+-:;-21>-+@4@  5555",
-"X$&&&&&&&$###$#.+--+@1432@ 55555",
-"X#&&&&&&&&&&$#32214432222=. 5555",
-"XX$&&&&&&&&&&#22222222224#X.. 55",
-"5XXX#&$&&&&&&422222224=OXo@%O. 5",
-"555.XXO$$$&&&=22223*#Xooo%%=O. 5",
-"555X,,%OX##$&#23=#ooo@o%%322%  5",
-"555.,,,,%%OXO##OXo%%%%322222@ 55",
-"555.%,,,,,,,%Ooo%O%322222222@ 55",
-"555.%,,,,,,,,,,%O22222222222%. 5",
-"555.o%%,,,,,,,,%%2222222224%X. 5",
-"5555..oO%,,,,,,,3222222,%oX..  5",
-"555555 ..oO%,,,,=2223%O...    55",
-"555555555 ..oO%,%3%Oo..    55555",
-"555555555555 ..ooXo.    55555555",
-"555555555555555..    55555555555",
-"55555555555555555555555555555555"
-};
diff --git a/redhat/applications/tellico/trinity-tellico.spec b/redhat/applications/tellico/trinity-tellico.spec
index 5eec6996b..575a0b426 100644
--- a/redhat/applications/tellico/trinity-tellico.spec
+++ b/redhat/applications/tellico/trinity-tellico.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp tellico
-%define version 1.3.2.1
-%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
 %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:	Icollection manager for books, videos, music [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.3.2.1
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://periapsis.org/tellico/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -36,10 +43,13 @@ Source0:	%{kdecomp}-3.5.13.tar.gz
 
 # [tellico] Fix compilation with GCC 4.7 [Bug #958]
 Patch1:		tellico-3.5.13-fix_gcc47_compilation.patch
+# [tellico] Fix "not a string literal" error
+Patch2:		tellico-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
 
@@ -108,12 +118,13 @@ as a separate package which can be updated through debian-volatile.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -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 -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"
@@ -121,27 +132,35 @@ as a separate package which can be updated through debian-volatile.
 
 
 %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}
 
 # Add svg icons to xdg directories
-%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/apps/tellico.svg
-%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
+%__install -D -c -p -m 644 -T icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg
+%__install -D -c -p -m 644 -T icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg
 
 # Remove  dead symlink from French translation
-%__rm %{?buildroot}%{tde_docdir}/HTML/fr/tellico/common
+%__rm %{?buildroot}%{tde_tdedocdir}/HTML/fr/tellico/common
 
 
 %find_lang %{kdecomp}
@@ -152,48 +171,48 @@ 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,-)
-%{_bindir}/tellico
-#%{_datadir}/pixmaps
-%{_datadir}/applications
-%{_datadir}/config/tellicorc
+%{tde_bindir}/tellico
+#%{tde_datadir}/pixmaps
+%{tde_datadir}/applications
+%{tde_datadir}/config/tellicorc
 
 %files data
 %defattr(-,root,root,-)
-%{_datadir}/apps/tellico/*.xsl
-%{_datadir}/apps/tellico/*.xml
-%{_datadir}/apps/tellico/*.png
-%{_datadir}/apps/tellico/entry-templates
-%{_datadir}/apps/tellico/*.py*
-%{_datadir}/apps/tellico/pics
-%{_datadir}/apps/tellico/report-templates
-%{_datadir}/apps/tellico/tellico.dtd
-%{_datadir}/apps/tellico/tellico.tips
-%{_datadir}/apps/tellico/tellico2html.js
-%{_datadir}/apps/tellico/tellicoui.rc
-%{_datadir}/apps/tellico/welcome.html
-%{_datadir}/config.kcfg
-%{tde_docdir}/HTML/*/tellico/
-%{_datadir}/icons
-%{_datadir}/apps/mime
-%{_datadir}/mimelnk
-%{_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{_datadir}/apps/kconf_update/tellico-rename.upd
-%{_datadir}/apps/kconf_update/tellico.upd
+%{tde_datadir}/apps/tellico/*.xsl
+%{tde_datadir}/apps/tellico/*.xml
+%{tde_datadir}/apps/tellico/*.png
+%{tde_datadir}/apps/tellico/entry-templates
+%{tde_datadir}/apps/tellico/*.py*
+%{tde_datadir}/apps/tellico/pics
+%{tde_datadir}/apps/tellico/report-templates
+%{tde_datadir}/apps/tellico/tellico.dtd
+%{tde_datadir}/apps/tellico/tellico.tips
+%{tde_datadir}/apps/tellico/tellico2html.js
+%{tde_datadir}/apps/tellico/tellicoui.rc
+%{tde_datadir}/apps/tellico/welcome.html
+%{tde_datadir}/config.kcfg
+%{tde_tdedocdir}/HTML/*/tellico/
+%{tde_datadir}/icons
+%{tde_datadir}/apps/mime
+%{tde_datadir}/mimelnk
+%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl
+%{tde_datadir}/apps/kconf_update/tellico-rename.upd
+%{tde_datadir}/apps/kconf_update/tellico.upd
 
 %files scripts
 %defattr(-,root,root,-)
-%{_datadir}/apps/tellico/data-sources
-%{_datadir}/apps/tellico/z3950-servers.cfg
+%{tde_datadir}/apps/tellico/data-sources
+%{tde_datadir}/apps/tellico/z3950-servers.cfg
 
 
 %Changelog