From d27f0076471e9f60e546dae988c35cf827f4255f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 6 Aug 2013 22:45:56 +0200
Subject: RPM Packaging: update lots of applications

---
 .../tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch         | 33 ++++++++++++++++++++++
 .../applications/tdeio-apt/tdeio-apt-14.0.0.spec   | 14 +++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch

(limited to 'redhat/applications/tdeio-apt')

diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch
new file mode 100644
index 000000000..b83b3f3ad
--- /dev/null
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0-ftbfs.patch
@@ -0,0 +1,33 @@
+--- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI	2013-07-29 11:26:26.740982531 +0200
++++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp	2013-07-29 11:26:53.970250335 +0200
+@@ -143,10 +143,10 @@
+  */
+ 
+ static const TQString
+-  html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
++  html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
+                   "<table class=\"query\">\n");
+ static const TQString
+-  html_form_end("<tr>\n"
++  html_form_end_apt("<tr>\n"
+                 "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
+                 "</tr>\n"
+                 "</table>\n"
+@@ -197,7 +197,7 @@
+   if (online)
+     stream << "<table class=\"queryform\"><tr><td>\n";
+ 
+-  stream << html_form_begin;
++  stream << html_form_begin_apt;
+   stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
+   stream << make_html_form_line("search", i18n("Package search"));
+   if (ext_form)
+@@ -206,7 +206,7 @@
+       stream << make_html_form_line("fsearch", i18n("File search"));
+     stream << make_html_form_line("show", i18n("Package info"));
+   }
+-  stream << html_form_end.arg( i18n("Search") );
++  stream << html_form_end_apt.arg( i18n("Search") );
+ 
+   if (online)
+   {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
index 44a060fcb..56520be7b 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
@@ -41,7 +41,10 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:			tdeio-apt-14.0.0-ftbfs.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
@@ -64,6 +67,7 @@ browsing the packages easier. It provides:
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .ftbfs
 
 %__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"
@@ -83,8 +87,14 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --includedir=%{tde_tdeincludedir} \
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
-  --disable-rpath \
-  --enable-closure
+  \
+  --disable-dependency-tracking \
+  --disable-debug \
+  --enable-final \
+  --enable-new-ldflags \
+  --enable-closure \
+  --enable-rpath \
+  --enable-gcc-hidden-visibility
 
 %__make %{?_smp_mflags}
 
-- 
cgit v1.2.1