Accepting request 17430 from KDE:KDE4:Factory:Desktop

Copy from KDE:KDE4:Factory:Desktop/k3b based on submit request 17430 from user Beineri

OBS-URL: https://build.opensuse.org/request/show/17430
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=5

k3b-1.66.0alpha2.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f66ccae344d832c8522a88d6aede2b73e694c9fe1fe87610c0ff0a76f08671d
-size 3865548
+oid sha256:9646454cba7920da9f4e76f0f4dbeea3333daffe50b7e8c3e31a7eb03374f340
+size 8936861

k3b.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 11 09:43:35 CEST 2009 - beineri@opensuse.org
+
+- update to r1009369, add documentation & translations (bnc#529600)
+
 -------------------------------------------------------------------
 Thu Jul 30 12:16:20 CEST 2009 - beineri@opensuse.org
 

k3b.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package k3b (Version 1.66.0.svn1004480)
+# spec file for package k3b (Version 1.66.0.svn1009369)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -41,18 +41,17 @@ License:        GPL v2 or later
 Group:          Productivity/Multimedia/CD/Record
 Summary:        A Universal CD and DVD Burning Application
 Requires:       /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
-Version:        1.66.0.svn1004480
+Version:        1.66.0.svn1009369
 Release:        1
 %define rversion 1.66.0
 # svn.kde.org/home/kde/trunk/extragear/multimedia/k3b
 Source0:        k3b-1.66.0alpha2.tar.bz2
-Patch1:         trunk.diff
-Patch2:         kde41.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires 
 Provides:       kde4-k3b = 4.2.1.svn942189
 Provides:       kde4-k3b = 4.2.2.svn951754
 Obsoletes:      kde4-k3b <= 4.2.2.svn951754
+Requires:       %{name}-lang = %{version}
 
 %description
 K3b is a CD burning application that supports Ogg Vorbis, MP3 audio
@@ -82,23 +81,29 @@ Authors:
     Sebastian Trueg <trueg@informatik.uni-freiburg.de>
     Thomas Froescher <tfroescher@gmx.de>
 
+%lang_package
 %prep
 %setup -q -n k3b-%{rversion}
-#%if %suse_version > 1110
-%patch1
-#%else
-#%patch2
-#%endif
 
 %build
   %cmake_kde4 -d build -- -DK3B_BUILD_K3BSETUP=OFF
   %make_jobs
 
 %install
-  cd build
+  pushd build
   %makeinstall
+  popd
   %suse_update_desktop_file k3b DiscBurning
   %kde_post_install
+  %if %suse_version < 1120
+    # work-around bnc#457908
+    for i in uk fr de et nl pt es sv; do mkdir $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/$i/common;done
+  %endif
+  %find_lang k3b k3b.lang
+  %find_lang k3bsetup k3b.lang
+  %find_lang libk3b k3b.lang
+  %find_lang libk3bdevice k3b.lang
+  %find_lang kio_videodvd k3b.lang
 
 %post -p /sbin/ldconfig
 
@@ -107,6 +112,8 @@ Authors:
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%files lang -f k3b.lang
+
 %files
 %defattr(-,root,root)
 /usr/bin/k3b
@@ -128,6 +135,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/kde4/apps/solid
 %dir /usr/share/kde4/apps/solid/actions
 /usr/share/kde4/apps/solid/actions/k3b_*.desktop
+%if %suse_version < 1120
+# work-around bnc#457911
+%dir /usr/share/doc/kde/HTML/*
+%dir /usr/share/locale/hne
+%dir /usr/share/locale/hne/LC_MESSAGES
+%endif
 
 %files devel
 %defattr(-,root,root)

kde41.diff

@@ -1,85 +0,0 @@
-Index: src/rip/videodvd/k3bvideodvdrippingwidget.cpp
-===================================================================
---- src/rip/videodvd/k3bvideodvdrippingwidget.cpp	(revision 958507)
-+++ src/rip/videodvd/k3bvideodvdrippingwidget.cpp	(working copy)
-@@ -26,7 +26,10 @@
- #include <kurllabel.h>
- #include <kdialog.h>
- #include <klineedit.h>
-+#include <kdeversion.h>
-+#if KDE_IS_VERSION(4,2,0)
- #include <KDiskFreeSpaceInfo>
-+#endif
- 
- #include <qcombobox.h>
- #include <qspinbox.h>
-@@ -255,10 +258,17 @@
-         path.truncate( path.lastIndexOf('/') );
- 
-     QPalette pal( m_labelFreeSpace->palette() );
-+#if KDE_IS_VERSION(4,2,0)
-     KDiskFreeSpaceInfo free = KDiskFreeSpaceInfo::freeSpaceInfo( path );
-     if( free.isValid() ) {
-         m_labelFreeSpace->setText( KIO::convertSizeFromKiB(free.available()) );
-         if( free.available() < m_neededSize/1024 )
-+#else
-+    unsigned long size, avail;
-+    if( K3b::kbFreeOnFs( path, size, avail ) ) {
-+        m_labelFreeSpace->setText( KIO::convertSizeFromKiB(avail) );
-+        if( avail < m_neededSize/1024 )
-+#endif
-             pal.setColor( QPalette::Text, Qt::red );
-         else
-             pal.setColor( QPalette::Text, palette().color( QPalette::Text ) );
-Index: libk3b/core/k3bglobals.cpp
-===================================================================
---- libk3b/core/k3bglobals.cpp	(revision 958522)
-+++ libk3b/core/k3bglobals.cpp	(working copy)
-@@ -33,7 +33,17 @@
- #include <kio/netaccess.h>
- #include <kurl.h>
- #include <kprocess.h>
-+#if KDE_IS_VERSION(4,2,0)
- #include <KDiskFreeSpaceInfo>
-+#else
-+#include <sys/stat.h>
-+#ifdef HAVE_SYS_STATVFS_H
-+#  include <sys/statvfs.h>
-+#endif
-+#ifdef HAVE_SYS_VFS_H
-+#  include <sys/vfs.h>
-+#endif
-+#endif
- 
- #include <kmountpoint.h>
- #include <Solid/Device>
-@@ -209,6 +219,7 @@
- 
- bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
- {
-+#if KDE_IS_VERSION(4,2,0)
-     KDiskFreeSpaceInfo fs = KDiskFreeSpaceInfo::freeSpaceInfo( path );
-     if ( fs.isValid() ) {
-         size = fs.size()/1024;
-@@ -218,6 +229,21 @@
-     else {
-         return false;
-     }
-+#else
-+#ifdef HAVE_SYS_STATVFS_H
-+    struct statvfs fs;
-+    if( ::statvfs( QFile::encodeName(path), &fs ) == 0 ) {
-+        unsigned long kBfak = fs.f_frsize/1024;
-+
-+        size = fs.f_blocks*kBfak;
-+        avail = fs.f_bavail*kBfak;
-+
-+        return true;
-+    }
-+    else
-+#endif
-+        return false;
-+#endif
- }
- 
-