RPM packaging: disable musicbrainz support in K3B (causes FTBFS), remove obsolete fedora patch

diff --git a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch b/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
deleted file mode 100644
index 4ee6105..0000000
--- a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
---- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize	2007-11-02 10:55:39.000000000 +0100
-+++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp	2008-04-22 14:15:06.000000000 +0200
-@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
-   : m_eject(true),
-     m_burnfree(true),
-     m_overburn(false),
--    m_useManualBufferSize(false),
-+    m_useManualBufferSize(true),
-     m_bufferSize(4),
-     m_force(false)
- {
-@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
-   m_eject = !c->readBoolEntry( "No cd eject", false );
-   m_burnfree = c->readBoolEntry( "burnfree", true );
-   m_overburn = c->readBoolEntry( "Allow overburning", false );
--  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
-+  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
-   m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
-   m_force = c->readBoolEntry( "Force unsafe operations", false );
- 
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index a83b551..d7745ea 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -57,11 +57,6 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source2:		k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:			k3b-1.0.4-manualbufsize.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -88,12 +83,6 @@
 BuildRequires:	libvorbis-devel
 BuildRequires:	taglib-devel
 BuildRequires:	zlib-devel
-
-%if 0%{?fedora} >= 24
-BuildRequires:	libmusicbrainz5-devel
-%else
-BuildRequires:	libmusicbrainz-devel
-%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -300,7 +289,6 @@
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_confdir}/k3brc
 %{tde_datadir}/mimelnk/application/x-k3b.desktop
 %{tde_datadir}/icons/hicolor/*/apps/k3b.png
 %{tde_datadir}/services/tdefile_k3b.desktop
@@ -419,9 +407,6 @@
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-
 
 %build
 unset QTDIR QTINC QTLIB
@@ -429,8 +414,8 @@
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 # FFMPEG trick ...
-if [ -d /usr/include/ffmpeg ]; then
-	export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+if [ -d "/usr/include/ffmpeg" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg -I/opt/trinity/include"
 fi
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -457,7 +442,7 @@
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
   -DWITH_ALL_OPTIONS="ON" \
-  -DWITH_MUSICBRAINZ="ON" \
+  -DWITH_MUSICBRAINZ="OFF" \
   -DWITH_FFMPEG_ALL_CODECS="ON" \
   -DWITH_MUSEPACK="ON" \
   ..
@@ -469,7 +454,6 @@
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_confdir}/k3brc
 
 # remove the .la files
 %__rm -f %{buildroot}%{tde_libdir}/libk3b*.la 
diff --git a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
deleted file mode 100644
index bd3bfde..0000000
--- a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ORI	2013-09-07 12:10:15.846286823 +0200
-+++ trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-09-07 12:11:08.020207223 +0200
-@@ -49,7 +49,7 @@
-   K3b::Msf length;
- 
-   // for decoding
--  char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-+  char outputBuffer[192000];
-   char* outputBufferPos;
-   int outputBufferSize;
-   AVPacket packet;
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc
deleted file mode 100644
index 5d967f5..0000000
--- a/redhat/applications/k3b/k3brc
+++ /dev/null
@@ -1,6 +0,0 @@
-[General Options]
-check system config=false
-Manual buffer size=true
-
-[Notification Messages]
-Don't prompt me again.=No
diff --git a/redhat/applications/k3b/trinity-k3b-icons.patch b/redhat/applications/k3b/trinity-k3b-icons.patch
deleted file mode 100644
index 4dd7622..0000000
--- a/redhat/applications/k3b/trinity-k3b-icons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop
-*** k3b.ori/src/k3b.desktop	Wed Dec 15 14:23:05 2010
---- k3b/src/k3b.desktop	Wed Dec 15 14:28:55 2010
-***************
-*** 116,123 ****
-  Name[ar]= K3b
-  Name[bn]=������-������������-������
-  Name[hi]=������3������
-! MimeType=application/x-k3b;application/x-iso;application/x-cue
-  X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
-! Categories=KDE;Application;AudioVideo;DiscBurning;
-  X-DCOP-ServiceType=Unique
---- 116,124 ----
-  Name[ar]= K3b
-  Name[bn]=������-������������-������
-  Name[hi]=������3������
-! Encoding=UTF-8
-! MimeType=application/x-k3b;application/x-iso;application/x-cue;
-  X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue;
-! Categories=KDE;AudioVideo;DiscBurning;
-  X-DCOP-ServiceType=Unique

RPM packaging: remove obsolete smartcardauth patch

diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch b/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch
deleted file mode 100644
index f6a7a25..0000000
--- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff --git a/src/ckpass.c b/src/ckpass.c
-index 1da83c6..f3a14d0 100644
---- a/src/ckpass.c
-+++ b/src/ckpass.c
-@@ -8,6 +8,8 @@
- **  or PAM.
- */
- 
-+extern x_malloc(size_t size, const char *file, int line);
-+
- /* Used for unused parameters to silence gcc warnings. */
- #define UNUSED  __attribute__((__unused__))
- 
-@@ -46,7 +48,7 @@
-    number information for debugging error messages without the user having to
-    pass those in every time. */
- #define xcalloc(n, size)        x_calloc((n), (size), __FILE__, __LINE__)
--#define xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
-+#define smartcardauth_xmalloc(size)           x_malloc((size), __FILE__, __LINE__)
- #define xrealloc(p, size)       x_realloc((p), (size), __FILE__, __LINE__)
- #define xstrdup(p)              x_strdup((p), __FILE__, __LINE__)
- #define xstrndup(p, size)       x_strndup((p), (size), __FILE__, __LINE__)
-@@ -71,7 +73,7 @@ struct auth_info {
- **  This function allocates an array of struct pam_response to return to the
- **  PAM libraries that's never freed.  For this program, this isn't much of an
- **  issue, since it will likely only be called once and then the program will
--**  exit.  This function uses malloc and strdup instead of xmalloc and xstrdup
-+**  exit.  This function uses malloc and strdup instead of smartcardauth_xmalloc and xstrdup
- **  intentionally so that the PAM conversation will be closed cleanly if we
- **  run out of memory rather than simply terminated.
- **
-@@ -82,8 +84,9 @@ static int pass_conv(int num_msg, const struct pam_message **msgm UNUSED, struct
-     int i;
- 
-     *response = malloc(num_msg * sizeof(struct pam_response));
--    if (*response == NULL)
-+    if (*response == NULL) {
-         return PAM_CONV_ERR;
-+    }
-     for (i = 0; i < num_msg; i++) {
-         (*response)[i].resp = strdup((char *)appdata_ptr);
-         (*response)[i].resp_retcode = 0;
-@@ -115,17 +118,21 @@ static bool auth_pam(const char *username, char *password)
-     conv.conv = pass_conv;
-     conv.appdata_ptr = password;
-     status = pam_start("nnrpd", username, &conv, &pamh);
--    if (status != PAM_SUCCESS)
-+    if (status != PAM_SUCCESS) {
-         die("pam_start failed: %s", pam_strerror(pamh, status));
-+    }
-     status = pam_authenticate(pamh, PAM_SILENT);
--    if (status != PAM_SUCCESS)
-+    if (status != PAM_SUCCESS) {
-         die("pam_authenticate failed: %s", pam_strerror(pamh, status));
-+    }
-     status = pam_acct_mgmt(pamh, PAM_SILENT);
--    if (status != PAM_SUCCESS)
-+    if (status != PAM_SUCCESS) {
-         die("pam_acct_mgmt failed: %s", pam_strerror(pamh, status));
-+    }
-     status = pam_end(pamh, status);
--    if (status != PAM_SUCCESS)
-+    if (status != PAM_SUCCESS) {
-         die("pam_end failed: %s", pam_strerror(pamh, status));
-+    }
- 
-     /* If we get to here, the user successfully authenticated. */
-     return true;
-@@ -153,8 +160,9 @@ password_dbm(char *name, const char *file)
-     char *password;
- 
-     database = dbm_open(file, O_RDONLY, 0600);
--    if (database == NULL)
-+    if (database == NULL) {
-         return NULL;
-+    }
-     key.dptr = name;
-     key.dsize = strlen(name);
-     value = dbm_fetch(database, key);
-@@ -162,7 +170,7 @@ password_dbm(char *name, const char *file)
-         dbm_close(database);
-         return NULL;
-     }
--    password = xmalloc(value.dsize + 1);
 ** Diff limit reached (max: 250 lines) **