RPM Packaging: updates for 3.5.13.2

8 files changed, 134 insertions, 48 deletions

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
new file mode 100644
index 000000000..bd3bfdebf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
@@ -0,0 +1,11 @@
+--- 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/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec
index 3e3b1578c..312876331 100644
--- a/redhat/applications/k3b/k3b-3.5.13.2.spec
+++ b/redhat/applications/k3b/k3b-3.5.13.2.spec
@@ -43,12 +43,16 @@ License:		GPLv2+
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source2:		k3brc
 
+# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete
+Patch1:			k3b-3.5.13.2-fix_ffmpeg_support.patch
+
 # Legacy RedHat / Fedora patches
 # manual bufsize (upstream?)
 Patch4:			k3b-1.0.4-manualbufsize.patch
 # RHEL6: Fix K3B icon
 Patch106:	trinity-k3b-icons.patch
 
+
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -388,7 +392,7 @@ and a generic audio and video file converter.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# set in k3brc too 
+%patch1 -p1 -b .ffmpeg
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
 
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index e92892bfe..d75eca278 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -82,7 +82,7 @@ BuildRequires: libxcb-devel
 %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gstreamer 1
 %if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-0_10-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 %if 0%{?rhel} == 4
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index 85470704d..5f67030ba 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -70,7 +70,7 @@ BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-base-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-0_10-devel
 BuildRequires:	gstreamer-0_10-plugins-base-devel
 %endif
 
diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
index aec76bc3f..bc485eccf 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13.2.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec
@@ -1,17 +1,13 @@
 # Default version for this component
-%define tdecomp knetworkmanager
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
+%define tde_pkg knetworkmanager8
+%define tde_version 3.5.13.2
 
 # 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
+# TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -28,41 +24,47 @@
 %define _docdir %{tde_tdedocdir}
 
 
-Name:			trinity-%{tdecomp}
-Version:		%{?version}
-Release:		5%{?dist}%{?_variant}
+Name:			trinity-%{tde_pkg}
+Version:		0.8
+Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
 
-Summary:        Trinity applet for Network Manager
+Summary:		Trinity applet for Network Manager
 
-Group:          Applications/Internet
-License:        GPLv2+
-URL:            http://en.opensuse.org/Projects/KNetworkManager
+Group:			Applications/Internet
+License:		GPLv2+
+URL:			http://en.opensuse.org/Projects/KNetworkManager
 
-%if "%{?version}" == "0.9"
-Source0:	trinity-knetworkmanager9-3.5.13.2.tar.gz
-%else
-Source0:	trinity-knetworkmanager8-3.5.13.2.tar.gz
-%endif
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch0:			knetworkmanager-3.5.13-missing_includes.patch
 
 # For knetworkmanager 0.9 only !
 Patch10:		knetworkmanager-3.5.13-subdir_version.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Requires:       kde-filesystem
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 
+# NETWORKMANAGER support
 %if 0%{?rhel} || 0%{?fedora}
-Requires:       NetworkManager-gnome
-%else
-Requires:       networkmanager
+Requires:		NetworkManager-gnome
 %endif
-
-BuildRequires:	trinity-dbus-1-tqt-devel
-BuildRequires:	trinity-dbus-tqt-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+Requires:		networkmanager
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	NetworkManager-glib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires:	NetworkManager-devel
+Requires:		NetworkManager
+%endif
+
+BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
+BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
+
+Obsoletes:		trinity-knetworkmanager < %{version}-%{release}
+Provides:		trinity-knetworkmanager = %{version}-%{release}
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -70,9 +72,12 @@ connections on systems that use the NetworkManager daemon.
 
 
 %package devel
-Summary:        Common data shared among the MySQL GUI Suites
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Summary:		Common data shared among the MySQL GUI Suites
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+Obsoletes:		trinity-knetworkmanager-devel < %{version}-%{release}
+Provides:		trinity-knetworkmanager-devel = %{version}-%{release}
 
 %description devel
 Development headers for knetworkmanager
@@ -84,11 +89,7 @@ Development headers for knetworkmanager
 
 
 %prep 
-%if "%{?version}" == "0.9"
-%setup -q -n %{name}9-3.5.13.2
-%else
-%setup -q -n %{name}8-3.5.13.2
-%endif
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %if "%{?version}" == "0.9"
 %patch10 -p1
@@ -103,25 +104,29 @@ cd knetworkmanager-0.*/src
 unset QTDIR || : ; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
 
 # Missing TDE macros
 %__mkdir_p cmake
 %__ln_s %{tde_datadir}/cmake cmake/modules
 
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %__mkdir_p build
 cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  -DCMAKE_SKIP_RPATH="OFF" \
   ..
   
 %__make %{?_smp_mflags} 
@@ -141,18 +146,22 @@ update-desktop-database %{tde_appdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
+
 %postun
 update-desktop-database %{tde_appdir} > /dev/null
 /sbin/ldconfig
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
+
 %post devel
 /sbin/ldconfig
 
+
 %postun devel
 /sbin/ldconfig
 
+
 %files 
 %defattr(-,root,root,-)
 %{tde_bindir}/knetworkmanager
diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
new file mode 100644
index 000000000..eb1f41ffd
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch
@@ -0,0 +1,62 @@
+diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp
+index 25f3a15..ee68521 100644
+--- a/krusader/VFS/temp_vfs.cpp
++++ b/krusader/VFS/temp_vfs.cpp
+@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ):
+ }
+ 
+ temp_vfs::~temp_vfs(){
+-	if( vfs_type == "-iso" ){
++	if( tmpvfs_type == ISO ){
+ 		// unmount the ISO image
+     KShellProcess umount;
+ 		umount << "umount -f" << tmpDir;
+@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){
+ }
+ 
+ void temp_vfs::handleAceArj(TQString origin, TQString type){
++    if (type == "-ace") {
++	tmpvfs_type = ACE;
++    }
++    else if (type == "-arj") {
++	tmpvfs_type = ARJ;
++    }
++
+ 	// for ace and arj we just unpack to the tmpDir
+ 	if( !KRarcHandler::arcHandled(type) ){
+   	if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported");
+@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){
+ 	rpm.clearArguments();
+ 	rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt";
+ 	rpm.start(KProcess::Block);
++	tmpvfs_type = RPM;
+ }
+ 
+ void temp_vfs::handleIso(TQString origin){
+@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){
+ 	KShellProcess mount;
+ 	mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir;
+ 	mount.start(KProcess::Block);
++	tmpvfs_type = ISO;
+ }
+diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h
+index 3b94248..d35169b 100644
+--- a/krusader/VFS/temp_vfs.h
++++ b/krusader/VFS/temp_vfs.h
+@@ -37,6 +37,8 @@
+ 
+ class temp_vfs : public normal_vfs  {
+ public: 
++	enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO};
++
+ 	temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable);
+ 	~temp_vfs();
+ 	TQString vfs_workingDir();
+@@ -50,6 +52,7 @@ protected:
+ 	void handleAceArj(TQString origin, TQString type);
+ 	void handleRpm(TQString origin);
+ 	void handleIso(TQString origin);
++	TMPVFS_TYPE tmpvfs_type;     //< the tmp vfs type.
+   TQString tmpDir;
+ 
+ };
diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index 2df09636c..a5e2f7623 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.2.spec
@@ -41,7 +41,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch0:			krusader-tmpvfs-ftbfs.diff
+Patch0:			krusader-3.5.13.2-tmpvfs-ftbfs.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
index fcade0876..c285b9265 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec
+++ b/redhat/applications/kvirc/kvirc-3.5.13.2.spec
@@ -164,8 +164,8 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
 %__mv \
-  %{?buildroot}%{tde_libdir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{tde_libdir}/kvirc/3.4/license/EULA
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
 
 
 %clean
@@ -199,7 +199,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
 %{tde_datadir}/icons/hicolor/*/*/*.xpm
-#%{tde_datadir}/kvirc
+%{tde_datadir}/kvirc
 %{tde_datadir}/mimelnk/text/*.desktop
 %{tde_datadir}/services/*.protocol
 %{tde_mandir}/man1/kvirc.1
@@ -210,7 +210,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_includedir}/kvirc/
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
-#%{tde_libdir}/kvirc/*/modules/*.la
+%{tde_libdir}/kvirc/*/modules/*.la
 
 
 %changelog