RPM packaging: update tde-systemsettings, tdesv, tdmtheme, tellico, tork, twin-style-crystal, wlassistant, yakuake

8 files changed, 117 insertions, 625 deletions

diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 26b065bdc..731363619 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -1,61 +1,95 @@
-# Default version for this component
-%define tde_pkg tellico
+#
+# spec file for package tellico (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 tellico
+%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:		Icollection manager for books, videos, music [Trinity]
-Version:		1.3.2.1
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.3.2.1
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Icollection manager for books, videos, music [Trinity]
+Group:		Applications/Utilities
+URL:		http://periapsis.org/tellico/
 
-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://periapsis.org/tellico/
+#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
 
-Patch1:			tellico-3.5.13.2-videodev.patch
-
-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
+
+# YAZ support
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	yaz
 BuildRequires:	%{_lib}yaz-devel
 %endif
 
+# XML2 support
+BuildRequires:  libxml2-devel
+
+# XSLT support
+BuildRequires:  libxslt-devel
+%if 0%{?rhel} == 4
+# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
+BuildRequires:  libgcrypt-devel
+%endif
+
 # V4L support
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
 BuildRequires:	libv4l-devel
@@ -67,6 +101,7 @@ BuildRequires:	%{_lib}v4l-devel
 Requires:		%{name}-data = %{version}-%{release}
 Requires:		%{name}-scripts = %{version}-%{release}
 
+
 %description
 Tellico is a collection manager for TDE. It includes default collections for
 books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -81,6 +116,22 @@ or any US-MARC compliant z39.50 server.
 The files are stored in XML format, avoiding the need for database server.
 It also makes it easy for other softwares to use the Tellico data.
 
+%post
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+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}/tellico
+#%{tde_datadir}/pixmaps
+%{tde_datadir}/applications
+%{tde_datadir}/config/tellicorc
+
+##########
 
 %package data
 Group:			Applications/Utilities
@@ -103,6 +154,32 @@ It also makes it easy for other softwares to use the Tellico data.
 This package contains the architecture independent files, such data files and
 documentation.
 
+%files data
+%defattr(-,root,root,-)
+%dir %{tde_datadir}/apps/tellico
+%{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/tdeconf_update/tellico-1-3-update.pl
+%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
+%{tde_datadir}/apps/tdeconf_update/tellico.upd
+
+##########
+
 %package scripts
 Group:			Applications/Utilities
 Summary:		collection manager for books, videos, music [scripts] [Trinity]
@@ -125,17 +202,24 @@ This package contains the scripts to import data from external sources, such
 as websites. As the format of the data may change, these scripts are provided
 as a separate package which can be updated through debian-volatile.
 
+%files scripts
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/tellico/data-sources
+%{tde_datadir}/apps/tellico/z3950-servers.cfg
+
+##########
 
-%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}}
 
 if [ -r /usr/include/libv4l1-videodev.h ]; then
-%patch1 -p1 -b .videodev
+%__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|"
 fi
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
@@ -186,51 +270,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-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}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{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/tdeconf_update/tellico-1-3-update.pl
-%{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
-%{tde_datadir}/apps/tdeconf_update/tellico.upd
-
-%files scripts
-%defattr(-,root,root,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-8
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.3.2.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index 2e8d3f9a3..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tellico/src/mainwindow.cpp.ORI	2012-05-06 12:54:09.395765577 +0200
-+++ tellico/src/mainwindow.cpp	2012-05-06 12:54:30.626306963 +0200
-@@ -53,6 +53,7 @@
- #include "core/drophandler.h"
- #include "latin1literal.h"
- 
-+#include <unistd.h>
- #include <kapplication.h>
- #include <kcombobox.h>
- #include <kiconloader.h>
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
deleted file mode 100644
index 5e93fd7d8..000000000
--- a/redhat/applications/tellico/tellico-3.5.13-fix_not_a_string_literal_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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-3.5.13.1-fix_ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
deleted file mode 100644
index 36b394666..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1-fix_ftbfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tellico-3.5.13.1/src/Makefile.am.ORI	2012-10-04 23:24:30.130403046 +0200
-+++ tellico-3.5.13.1/src/Makefile.am	2012-10-04 23:25:46.806848842 +0200
-@@ -33,7 +33,7 @@
- 	./commands/libcommands.a -lexslt $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) \
- 	$(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_KIO) \
- 	$(LIB_KABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_KNEWSTUFF) $(EXEMPI_LIBS) \
--	$(POPPLER_LIBS) $(LDADD_LIBBARCODE)
-+	$(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS)
- 
- EXTRA_DIST = tellicoui.rc tellicorc \
- borrowerdialog.cpp          entryiconview.h\
diff --git a/redhat/applications/tellico/tellico-3.5.13.1.spec b/redhat/applications/tellico/tellico-3.5.13.1.spec
deleted file mode 100644
index 4827ec653..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.1.spec
+++ /dev/null
@@ -1,239 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# 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:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	4%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-
-# [tellico] Fix "not a string literal" error
-Patch2:		tellico-3.5.13-fix_not_a_string_literal_error.patch
-# [tellico] Fix FTBFS
-Patch3:		tellico-3.5.13.1-fix_ftbfs.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
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	yaz
-BuildRequires:	%{_lib}yaz-devel
-%endif
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-as a separate package which can be updated through debian-volatile.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch2 -p1
-%patch3 -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} || %__make
-
-
-%install
-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}%{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_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-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}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{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,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch b/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
deleted file mode 100644
index 5695d8fff..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode.cpp.ORI	2013-07-29 17:21:06.358915613 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode.cpp	2013-07-29 17:22:29.505126885 +0200
-@@ -172,14 +172,14 @@
-   for (int i = 0; i < 10; i++) {
-     TQCString temp;
-     temp.setNum( i );
--    fprintf( stderr, temp + " :   " );
-+    fprintf( stderr, "%s :   ", *(temp) );
-     for (int j = 0; j < 13; j++) {
-       if (array[i][j][level] == -1)
-         fprintf( stderr, "x  " );
-       else {
-         TQCString temp;
-         temp.setNum( array[i][j][level] );
--        fprintf( stderr, temp + "  " );
-+        fprintf( stderr, "%s  ", *(temp) );
-       }
-     }
-     fprintf( stderr, "\n" );
diff --git a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch b/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
deleted file mode 100644
index 261b24363..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.2-videodev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h.ORI	2013-07-28 22:22:41.390223800 +0200
-+++ trinity-tellico-3.5.13.2/src/barcode/barcode_v4l.h	2013-07-28 22:23:10.085637439 +0200
-@@ -31,7 +31,7 @@
- #endif
- 
- //#include <linux/videodev2.h>
--#include <linux/videodev.h>
-+#include <libv4l1.h>
- 
- #include <tqstring.h>
- #include <tqimage.h>
diff --git a/redhat/applications/tellico/tellico-3.5.13.spec b/redhat/applications/tellico/tellico-3.5.13.spec
deleted file mode 100644
index 64b7fed47..000000000
--- a/redhat/applications/tellico/tellico-3.5.13.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-# Default version for this component
-%define kdecomp tellico
-
-# 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:	Icollection manager for books, videos, music [Trinity]
-Version:	1.3.2.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://periapsis.org/tellico/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-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-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-Requires:	%{name}-data = %{version}-%{release}
-Requires:	%{name}-scripts = %{version}-%{release}
-
-%description
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-
-%package data
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [data] [Trinity]
-
-%description data
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the architecture independent files, such data files and
-documentation.
-
-%package scripts
-Group:		Applications/Utilities
-Summary:	collection manager for books, videos, music [scripts] [Trinity]
-
-%description scripts
-Tellico is a collection manager for TDE. It includes default collections for
-books, bibliographies, comic books, videos, music, coins, stamps, trading
-cards, and wines, and also allows custom collections; with unlimited
-user-defined fields allowed. Automatically formatted names, sorting by any
-property, filters, automatic ISBN validation and full customization for
-printing or display through XSLT files are some of the features present. It
-can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX,
-BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB,
-or any US-MARC compliant z39.50 server.
-
-The files are stored in XML format, avoiding the need for database server.
-It also makes it easy for other softwares to use the Tellico data.
-
-This package contains the scripts to import data from external sources, such
-as websites. As the format of the data may change, these scripts are provided
-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|%{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}
-
-# Add svg icons to xdg directories
-%__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_tdedocdir}/HTML/fr/tellico/common
-
-
-%find_lang %{kdecomp}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-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}/tellico
-#%{tde_datadir}/pixmaps
-%{tde_datadir}/applications
-%{tde_datadir}/config/tellicorc
-
-%files data
-%defattr(-,root,root,-)
-%{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,-)
-%{tde_datadir}/apps/tellico/data-sources
-%{tde_datadir}/apps/tellico/z3950-servers.cfg
-
-
-%Changelog
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-3
-- Fix compilation with GCC 4.7 [Bug #958]
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-2
-- Fix HTML directory location
-
-* Thu Nov 24 2011 Francois Andriot <francois.andriot@free.fr> - 1.3.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16