RPM Packaging: update

4 files changed, 0 insertions, 44 deletions

diff --git a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch
deleted file mode 100644
index 562dc2812..000000000
--- a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ./bibletime/backend/clanguagemgr.cpp.ORI	2014-02-23 21:50:05.169018790 +0100
-+++ ./bibletime/backend/clanguagemgr.cpp	2014-02-23 21:55:06.105229001 +0100
-@@ -95,10 +95,10 @@
- 
- 		for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) {
- 			//   for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
--			abbrev = (*it)->module()->Lang();
-+			const char* mod = (*it)->module()->Lang();
- 
--			if (abbrev && !abbrevs.contains(abbrev)) {
--				abbrevs.append( abbrev );
-+			if (mod && !abbrevs.contains(mod)) {
-+				abbrevs.append( mod );
- 			}
- 		};
- 
---- ./sword.m4.ori	2014-02-23 22:31:45.119410870 +0100
-+++ ./sword.m4	2014-02-23 22:32:45.468246504 +0100
-@@ -28,7 +28,7 @@
- dnl try to find Sword library files
- AC_MSG_CHECKING([for Sword library files])
- AC_REQUIRE([AC_FIND_ZLIB])
--ac_sword_library_dirs="$ac_sword_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-+ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
- 
- if test "x$ac_static_sword" = "xYES"; then
- 	SEARCH_LIBS="libsword.a";
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index dc30cfc8a..62ef360a5 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -39,7 +39,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			bibletime-14.0.0-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -80,7 +79,6 @@ texts, write own notes, save, print etc.).
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
 
 %__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"
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0-ftbfs.patch b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0-ftbfs.patch
deleted file mode 100644
index 5791a69d2..000000000
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0-ftbfs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- trinity-koffice-i18n-14.0.0~pre61+1ce1f0d2/koffice-i18n-pt_BR/docs/koffice/kword/storeprint.docbook.ORI	2014-03-23 18:45:24.486623559 +0100
-+++ trinity-koffice-i18n-14.0.0~pre61+1ce1f0d2/koffice-i18n-pt_BR/docs/koffice/kword/storeprint.docbook	2014-03-23 18:46:01.804769286 +0100
-@@ -664,7 +664,8 @@
- ><para
- >O botão de <guibutton
- >Opções do Sistema</guibutton
--> permite a um usuário alterar a configuração das impressoras e do sistema de impressão do &kde;.</note>
-+> permite a um usuário alterar a configuração das impressoras e do sistema de impressão do &kde;.</para
-+></note>
- 
- <note
- ><para
diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
index dd5491f72..ca908abf0 100644
--- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
+++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
@@ -53,8 +53,6 @@ AutoReq: no
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch0:			koffice-i18n-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}
@@ -548,7 +546,6 @@ Provides: %{name}-tz_TW = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .ftbfs
 
 %__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"