From 105735059c318ed437b9ec6d3fb22853bf42cdb0 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@fedoraproject.org>
Date: Jun 07 2007 14:05:05 +0000
Subject: - k3b-1.0.1 update release for F-7


---

diff --git a/k3b-0.11.14-rdrw.patch b/k3b-0.11.14-rdrw.patch
deleted file mode 100644
index 0290aed..0000000
--- a/k3b-0.11.14-rdrw.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- k3b-0.11.14/libk3bdevice/k3bdevice.cpp.rdrw	2004-09-01 11:38:38.650198640 +0200
-+++ k3b-0.11.14/libk3bdevice/k3bdevice.cpp	2004-09-01 11:39:06.021037640 +0200
-@@ -80,12 +80,12 @@
-   int fd = -1;
- #ifdef HAVE_RESMGR
-   // first try resmgr
--  fd = ::rsm_open_device( name, O_RDONLY | O_NONBLOCK );
-+  fd = ::rsm_open_device( name, O_RDWR | O_NONBLOCK );
-   kdDebug() << "(K3bCdDevice) resmgr open: " << fd << endl;
- #endif
- 
-   if( fd < 0 )
--    fd = ::open( name, O_RDONLY | O_NONBLOCK );
-+    fd = ::open( name, O_RDWR | O_NONBLOCK );
- 
-   if( fd < 0 )
-     fd = -1;
diff --git a/k3b-0.11.14-suid.patch b/k3b-0.11.14-suid.patch
deleted file mode 100644
index eaf5182..0000000
--- a/k3b-0.11.14-suid.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp.suid	2005-03-02 14:04:00.000000000 +0100
-+++ k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp	2005-03-02 14:05:11.000000000 +0100
-@@ -188,7 +188,7 @@
-     if( out.output().contains( "-xamix" ) ||
- 	bin->version >= K3bVersion( 2, 1, -1, "a12" ) )
-       bin->addFeature( "xamix" );
--
-+#if 0
-     // check if we run cdrecord as root
-     if( !getuid() )
-       bin->addFeature( "suidroot" );
-@@ -199,6 +199,9 @@
- 	  bin->addFeature( "suidroot" );
-       }
-     }
-+#endif
-+    bin->addFeature( "suidroot" );
-+
-   }
-   else {
-     kdDebug() << "(K3bCdrecordProgram) could not start " << bin->path << endl;
-@@ -280,16 +283,7 @@
-     if( out.output().contains( "-overburn" ) )
-       bin->addFeature( "overburn" );
-     
--    // check if we run cdrecord as root
--    if( !getuid() )
--      bin->addFeature( "suidroot" );
--    else {
--      struct stat s;
--      if( !::stat( QFile::encodeName(path), &s ) ) {
--	if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	  bin->addFeature( "suidroot" );
--      }
--    }
-+    bin->addFeature( "suidroot" );
-   }
-   else {
-     kdDebug() << "(K3bDvdrecordProgram) could not start " << bin->path << endl;
-@@ -371,15 +365,7 @@
-       bin->addFeature( "sectype" );
- 
-     // check if we run mkisofs as root
--    if( !getuid() )
--      bin->addFeature( "suidroot" );
--    else {
--      struct stat s;
--      if( !::stat( QFile::encodeName(path), &s ) ) {
--	if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	  bin->addFeature( "suidroot" );
--      }
--    }
-+    bin->addFeature( "suidroot" );
-   }
-   else {
-     kdDebug() << "(K3bMkisofsProgram) could not start " << bin->path << endl;
-@@ -451,16 +437,7 @@
-     if( out.output().contains( "-clone" ) )
-       bin->addFeature( "clone" );
- 
--    // check if we run mkisofs as root
--    if( !getuid() )
--      bin->addFeature( "suidroot" );
--    else {
--      struct stat s;
--      if( !::stat( QFile::encodeName(path), &s ) ) {
--	if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	  bin->addFeature( "suidroot" );
--      }
--    }
-+    bin->addFeature( "suidroot" );
-   }
-   else {
-     kdDebug() << "(K3bReadcdProgram) could not start " << bin->path << endl;
-@@ -549,15 +526,7 @@
-       bin->addFeature( "disable-burnproof" );
- 
-     // check if we run cdrdao as root
--    if( !getuid() )
--      bin->addFeature( "suidroot" );
--    else {
--      struct stat s;
--      if( !::stat( QFile::encodeName(path), &s ) ) {
--	if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	  bin->addFeature( "suidroot" );
--      }
--    }
-+    bin->addFeature( "suidroot" );
-   }
-   else {
-     kdDebug() << "(K3bCdrdaoProgram) could not start " << bin->path << endl;
-@@ -804,17 +773,7 @@
-   // fixed Copyright:
-   bin->copyright = "Andy Polyakov <appro@fy.chalmers.se>";
- 
--  // check if we run growisofs as root
--  if( !getuid() )
--    bin->addFeature( "suidroot" );
--  else {
--    struct stat s;
--    if( !::stat( QFile::encodeName(path), &s ) ) {
--      if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	bin->addFeature( "suidroot" );
--    }
--  }
--
-+  bin->addFeature( "suidroot" );
-   addBin( bin );
-   return true;
- }
-@@ -879,15 +838,7 @@
-   bin->copyright = "Andy Polyakov <appro@fy.chalmers.se>";
- 
-   // check if we run dvd+rw-format as root
--  if( !getuid() )
--    bin->addFeature( "suidroot" );
--  else {
--    struct stat s;
--    if( !::stat( QFile::encodeName(path), &s ) ) {
--      if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	bin->addFeature( "suidroot" );
--    }
--  }
-+  bin->addFeature( "suidroot" );
- 
-   addBin( bin );
-   return true;
-@@ -961,16 +912,7 @@
-     return false;
-   }
- 
--  // check if we run as root
--  if( !getuid() )
--    bin->addFeature( "suidroot" );
--  else {
--    struct stat s;
--    if( !::stat( QFile::encodeName(path), &s ) ) {
--      if( (s.st_mode & S_ISUID) && s.st_uid == 0 )
--	bin->addFeature( "suidroot" );
--    }
--  }
-+  bin->addFeature( "suidroot" );
- 
-   addBin( bin );
-   return true;
diff --git a/k3b-0.11.14-version.patch b/k3b-0.11.14-version.patch
deleted file mode 100644
index 7487596..0000000
--- a/k3b-0.11.14-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- k3b-0.11.14/libk3b/core/k3bdefaultexternalprograms.cpp.version	2004-07-21 12:04:57.000000000 +0200
-+++ k3b-0.11.14/libk3b/core/k3bdefaultexternalprograms.cpp	2004-10-05 16:16:32.366203424 +0200
-@@ -160,6 +160,11 @@
-   }
- 
- 
-+  if( !m_dvdPro && bin->version.suffix().endsWith( "-dvd" ) ) {
-+    bin->addFeature( "dvd-patch" );
-+    bin->version = QString(bin->version.versionString()).remove("-dvd");
-+  }
-+
- 
-   // probe features
-   KProcess fp;
-@@ -197,9 +202,6 @@
-     return false;
-   }
- 
--  if( !m_dvdPro && bin->version.suffix().endsWith( "-dvd" ) )
--    bin->addFeature( "dvd-patch" );
--
-   // FIXME: are these version correct?
-   if( bin->version >= K3bVersion("1.11a38") )
-     bin->addFeature( "plain-atapi" );
diff --git a/k3b-0.11.17-dao.patch b/k3b-0.11.17-dao.patch
deleted file mode 100644
index 100940e..0000000
--- a/k3b-0.11.17-dao.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- k3b-0.11.20/src/cdcopy/k3bcdcopyjob.cpp.dao	2005-02-04 09:46:38.000000000 +0100
-+++ k3b-0.11.20/src/cdcopy/k3bcdcopyjob.cpp	2005-03-02 14:06:53.000000000 +0100
-@@ -824,10 +824,10 @@
-     bool multi = d->doNotCloseLastSession || (d->numSessions > 1 && d->currentWrittenSession < d->toc.count());
-     int usedWritingMode = m_writingMode;
-     if( usedWritingMode == K3b::WRITING_MODE_AUTO ) {
--      // a lot of writers have problems to write pure Data CDs in DAO mode with cdrecord.
--      // So we simply always use TAO. I don't like it that much but maybe this will finally
--      // get rid of the bug reports...
--      usedWritingMode = K3b::TAO;
-+      if( !m_writerDevice->dao() || d->toc.count() > 1 || multi )
-+	usedWritingMode = K3b::TAO;
-+      else
-+	usedWritingMode = K3b::DAO;
-     }
-     d->cdrecordWriter->setWritingMode( usedWritingMode );
- 
---- k3b-0.11.20/src/projects/datacd/k3bdatajob.cpp.dao	2005-02-04 09:46:39.000000000 +0100
-+++ k3b-0.11.20/src/projects/datacd/k3bdatajob.cpp	2005-03-02 14:09:21.000000000 +0100
-@@ -586,12 +586,7 @@
-   // which is basicly to always use TAO since so many writers have problems to write Data CDs in DAO
-   // mode. Is there any drawback?
-   if( d->doc->writingMode() == K3b::WRITING_MODE_AUTO ) {
--    // use DAO for overburned CDs
--    // TODO: put this into the cdreocrdwriter and decide based on the size of the
--    // track
--    k3bcore->config()->setGroup("General Options");
--    if( k3bcore->config()->readBoolEntry( "Allow overburning", false ) &&
--        writer()->dao() &&
-+    if( writer()->dao() &&
-         d->doc->multiSessionMode() == K3bDataDoc::NONE )
-       d->usedWritingMode = K3b::DAO;
-     else
---- k3b-0.11.20/src/images/k3biso9660imagewritingjob.cpp.dao	2005-02-04 09:46:38.000000000 +0100
-+++ k3b-0.11.20/src/images/k3biso9660imagewritingjob.cpp	2005-03-02 14:06:53.000000000 +0100
-@@ -272,18 +272,19 @@
-     if( usedWriteMode == K3b::WRITING_MODE_AUTO ) {
-       // cdrecord seems to have problems when writing in mode2 in dao mode
-       // so with cdrecord we use TAO
--      // and many writers fail to write DAO with cdrecord.
--      // Is there any backdraw? Except that the track will contain two bogus sectors?
--      usedWriteMode = K3b::TAO;
-+      if( m_noFix || m_dataMode == K3b::MODE2 || !m_device->dao() )
-+	usedWriteMode = K3b::TAO;
-+      else
-+	usedWriteMode = K3b::DAO;
-     }
- 
-     int usedApp = writingApp();
-     if( usedApp == K3b::DEFAULT ) {
--      if( usedWriteMode == K3b::DAO && ( m_dataMode == K3b::MODE2 || m_noFix ) )
-+      if( usedWriteMode == K3b::DAO &&
-+	  ( m_dataMode == K3b::MODE2 || m_noFix ) )
- 	usedApp = K3b::CDRDAO;
--      else {
-+      else
- 	usedApp = K3b::CDRECORD;
--      }
-     }
- 
- 
diff --git a/k3b-0.11.23-proxy.patch b/k3b-0.11.23-proxy.patch
deleted file mode 100644
index af1b142..0000000
--- a/k3b-0.11.23-proxy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-2005-06-12 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-	* k3bcddbhttpquery.cpp/K3bCddbHttpQuery::slotConnected():
-	  added ' HTTP/1.0' to the 'GET ...' to make it a valid HTTP
-	  request
-
---- k3b-0.11.23/libk3b/cddb/k3bcddbhttpquery.cpp.proxy
-+++ k3b-0.11.23/libk3b/cddb/k3bcddbhttpquery.cpp
-@@ -100,6 +100,7 @@
-     query.append( "&hello=" );
-     query.append( handshakeString().replace( QRegExp( "\\s" ), "+" ) );
-     query.append( "&proto=5" );
-+    query.append( " HTTP/1.0" );
- 
-     query.prepend( "GET " );
- 
-@@ -116,6 +117,7 @@
-     query.append( "&hello=" );
-     query.append( handshakeString().replace( QRegExp( "\\s" ), "+" ) );
-     query.append( "&proto=5" );
-+    query.append( " HTTP/1.0" );
-       
-     query.prepend( "GET " );
- 
diff --git a/k3b-0.11.23-statfs.patch b/k3b-0.11.23-statfs.patch
deleted file mode 100644
index 324d12c..0000000
--- a/k3b-0.11.23-statfs.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- k3b-0.11.23/src/k3btempdirselectionwidget.cpp.statfs	2005-04-06 13:31:55.000000000 +0000
-+++ k3b-0.11.23/src/k3btempdirselectionwidget.cpp	2005-04-06 13:32:16.000000000 +0000
-@@ -109,7 +109,7 @@
-   if( !QFile::exists( path ) )
-     path.truncate( path.findRev('/') );
- 
--  unsigned long size, avail;
-+  unsigned long long size, avail;
-   if( K3b::kbFreeOnFs( path, size, avail ) )
-     slotFreeTempSpace( path, size, 0, avail );
-   else
---- k3b-0.11.23/libk3b/jobs/k3bcdcopyjob.cpp.statfs	2005-04-06 13:41:00.000000000 +0000
-+++ k3b-0.11.23/libk3b/jobs/k3bcdcopyjob.cpp	2005-04-06 13:41:20.000000000 +0000
-@@ -294,7 +294,7 @@
- 	  imageSpaceNeeded += (*it).length().mode1Bytes();
-       }
- 
--      unsigned long avail, size;
-+      unsigned long long avail, size;
-       QString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
-       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
---- k3b-0.11.23/src/rip/k3bvideocdrippingdialog.cpp.statfs	2005-04-06 13:35:36.000000000 +0000
-+++ k3b-0.11.23/src/rip/k3bvideocdrippingdialog.cpp	2005-04-06 13:39:24.000000000 +0000
-@@ -186,9 +186,9 @@
- }
- 
- void K3bVideoCdRippingDialog::slotFreeSpace(const QString&,
--						  unsigned long,
--						  unsigned long,
--						  unsigned long kbAvail)
-+						  unsigned long long,
-+						  unsigned long long,
-+						  unsigned long long kbAvail)
- {
-     m_labelFreeSpace->setText( KIO::convertSizeFromKB(kbAvail) );
- 
-@@ -210,7 +210,7 @@
-     if( !QFile::exists( path ) )
-         path.truncate( path.findRev('/') );
- 
--    unsigned long size, avail;
-+    unsigned long long size, avail;
-     if( K3b::kbFreeOnFs( path, size, avail ) )
-         slotFreeSpace( path, size, 0, avail );
-     else
---- k3b-0.11.23/src/rip/k3bvideocdrippingdialog.h.statfs	2005-04-06 13:38:54.000000000 +0000
-+++ k3b-0.11.23/src/rip/k3bvideocdrippingdialog.h	2005-04-06 13:37:13.000000000 +0000
-@@ -66,7 +66,7 @@
-   void slotSaveUserDefaults();
- 
-   void slotUpdateFreeSpace();
--  void slotFreeSpace(const QString&, unsigned long, unsigned long, unsigned long);
-+  void slotFreeSpace(const QString&, unsigned long long, unsigned long long, unsigned long long);
- 
- };
- 
---- k3b-0.11.23/src/rip/k3bdvdripperwidget.h.statfs	2004-01-21 10:20:20.000000000 +0000
-+++ k3b-0.11.23/src/rip/k3bdvdripperwidget.h	2005-04-06 13:18:57.000000000 +0000
-@@ -95,8 +95,8 @@
-     void slotFindStaticDir();
-     void slotRipJobDeleted();
-     void slotSetDependDirs( const QString& );
--    void slotFreeTempSpace( const QString & mountPoint, unsigned long kBSize,
--        unsigned long kBUsed, unsigned long kBAvail );
-+    void slotFreeTempSpace( const QString & mountPoint, unsigned long long kBSize,
-+        unsigned long long kBUsed, unsigned long long kBAvail );
-     void slotParseError( KProcess *p, char *text, int len );
-     void slotCheckOpenEncoding(int);
-     void slotOpenEncoding( bool );
---- k3b-0.11.23/src/rip/k3bdvdripperwidget.cpp.statfs	2004-09-27 07:18:03.000000000 +0000
-+++ k3b-0.11.23/src/rip/k3bdvdripperwidget.cpp	2005-04-06 13:18:57.000000000 +0000
-@@ -243,12 +243,17 @@
-     }
-     struct statfs fs;
-     ::statfs( QFile::encodeName( tmp ), &fs );
--    unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
--    slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
-+    unsigned long long size, used, avail;
-+    size = (fs.f_blocks * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    used = ((fs.f_blocks-fs.f_bfree) * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    avail = (fs.f_bavail * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    slotFreeTempSpace( tmp, size, used, avail );
-+    // unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
-+    // slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
- }
- 
--void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long kBSize,
--        unsigned long kBUsed, unsigned long kBAvail ){
-+void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long long kBSize,
-+        unsigned long long kBUsed, unsigned long long kBAvail ){
-     m_fillDisplay->setKbSize( kBSize );
-     m_fillDisplay->setKbAvailable( kBAvail );
-     m_fillDisplay->setKbUsed( kBUsed );
---- k3b-0.11.23/libk3b/jobs/k3bdvdcopyjob.cpp.statfs	2005-04-06 13:42:54.000000000 +0000
-+++ k3b-0.11.23/libk3b/jobs/k3bdvdcopyjob.cpp	2005-04-06 13:43:13.790966576 +0000
-@@ -238,7 +238,7 @@
-       // check free temp space
-       //
-       KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048;
--      unsigned long avail, size;
-+      unsigned long long avail, size;
-       QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
-       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
---- k3b-0.11.23/libk3b/core/k3bglobals.cpp.statfs	2005-01-19 12:54:42.000000000 +0000
-+++ k3b-0.11.23/libk3b/core/k3bglobals.cpp	2005-04-06 13:18:57.000000000 +0000
-@@ -215,15 +215,15 @@
- }
- 
- 
--bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
-+bool K3b::kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail )
- {
-   struct statfs fs;
- 
-   if( ::statfs( QFile::encodeName(path), &fs ) == 0 ) {
--    unsigned long kBfak = fs.f_bsize/1024;
-+    // unsigned long kBfak = fs.f_bsize/1024;
- 
--    size = fs.f_blocks*kBfak;
--    avail = fs.f_bavail*kBfak;
-+    size = (fs.f_blocks*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
-+    avail = (fs.f_bavail*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
- 
-     return true;
-   }
---- k3b-0.11.23/libk3b/core/k3bglobals.h.statfs	2005-01-19 12:54:42.000000000 +0000
-+++ k3b-0.11.23/libk3b/core/k3bglobals.h	2005-04-06 13:18:57.563346824 +0000
-@@ -83,7 +83,7 @@
-    * We use this since we encountered problems with the KDE version.
-    * @returns true on success.
-    */
--  bool kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail );
-+  bool kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail );
- 
-   /**
-    * Cut a filename preserving the extension
---- k3b-0.11.23/src/k3bstatusbarmanager.cpp.statfs	2005-04-06 15:57:21.417541376 +0000
-+++ k3b-0.11.23/src/k3bstatusbarmanager.cpp	2005-04-06 15:57:34.742515672 +0000
-@@ -83,7 +83,7 @@
-   if( !QFile::exists( path ) )
-     path.truncate( path.findRev('/') );
- 
--  unsigned long size, avail;
-+  unsigned long long size, avail;
-   if( K3b::kbFreeOnFs( path, size, avail ) )
-     slotFreeTempSpace( path, size, 0, avail );
-   else
diff --git a/k3b-0.11.3-kde32.patch b/k3b-0.11.3-kde32.patch
deleted file mode 100644
index 3a71ed6..0000000
--- a/k3b-0.11.3-kde32.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nur k3b-0.11.3-orig/k3bsetup/k3bsetup2.desktop k3b-0.11.3/src/k3bsetup/k3bsetup2.desktop
---- k3b-0.11.3-orig/k3bsetup/k3bsetup2.desktop	2004-01-23 17:01:52.000000000 +0100
-+++ k3b-0.11.3/k3bsetup/k3bsetup2.desktop	2004-02-14 05:23:57.000000000 +0100
-@@ -45,4 +45,4 @@
- X-KDE-Library=k3bsetup2
- X-KDE-ModuleType=Library
- X-KDE-RootOnly=true
--Categories=Application;System;X-KDE-System;
-+Categories=Application;System;X-KDE-settings-system;
diff --git a/k3b-0.11.6-desktopfile.patch b/k3b-0.11.6-desktopfile.patch
deleted file mode 100644
index 4fc9f50..0000000
--- a/k3b-0.11.6-desktopfile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nur k3b-0.11.6-orig/src/k3b.desktop k3b-0.11.6/src/k3b.desktop
---- k3b-0.11.6-orig/src/k3b.desktop	2004-01-23 17:01:51.000000000 +0100
-+++ k3b-0.11.6/src/k3b.desktop	2004-03-01 16:45:43.000000000 +0100
-@@ -1,4 +1,3 @@
--# KDE Config File  
- [Desktop Entry]
- Type=Application
- Exec=k3b
diff --git a/k3b-0.12.14-norootwarning.patch b/k3b-0.12.14-norootwarning.patch
deleted file mode 100644
index 4018ee0..0000000
--- a/k3b-0.12.14-norootwarning.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- k3b-0.12.14/src/k3bsystemproblemdialog.cpp.noroot	2006-04-18 14:59:57.000000000 +0200
-+++ k3b-0.12.14/src/k3bsystemproblemdialog.cpp	2006-04-18 15:03:39.000000000 +0200
-@@ -207,6 +207,8 @@
- 					   i18n("Use K3bSetup to solve this problem."),
- 					   true ) );
-     }
-+
-+#if 0
-     else if( !k3bcore->externalBinManager()->binObject( "cdrecord" )->hasFeature( "suidroot" ) && getuid() != 0 ) // not root
-       problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- 					 i18n("%1 will be run without root privileges").arg("cdrecord"),
-@@ -220,6 +222,7 @@
- 					 i18n("Use K3bSetup to solve this problem."),
- 					 true ) );
- #endif
-+#endif
-   }
- 
-   if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -231,6 +234,7 @@
-   }
-   else {
- #ifdef Q_OS_LINUX
-+#if 0
-     if( !k3bcore->externalBinManager()->binObject( "cdrdao" )->hasFeature( "suidroot" ) && getuid() != 0 )
-       problems.append( K3bSystemProblem( K3bSystemProblem::CRITICAL,
- 					 i18n("%1 will be run without root privileges").arg("cdrdao"),
-@@ -240,6 +244,7 @@
- 					 i18n("Use K3bSetup to solve this problem."),
- 					 true ) );
- #endif
-+#endif
-   }
- 
-   if( !k3bcore->deviceManager()->dvdWriter().isEmpty() ) {
diff --git a/k3b-0.12.2-compile.patch b/k3b-0.12.2-compile.patch
deleted file mode 100644
index 0335e05..0000000
--- a/k3b-0.12.2-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- k3b-0.12.2/acinclude.m4.badcomp	2005-07-13 14:40:52.000000000 +0200
-+++ k3b-0.12.2/acinclude.m4	2005-07-13 14:41:05.000000000 +0200
-@@ -2924,7 +2924,7 @@
- #endif
- ], ,
-   kde_bad_compiler=no, 
--  kde_bad_compiler=yes
-+  kde_bad_compiler=no
- )
- 
-   AC_MSG_RESULT($kde_bad_compiler)
diff --git a/k3b-0.12.2-statfs.patch b/k3b-0.12.2-statfs.patch
deleted file mode 100644
index b4c7689..0000000
--- a/k3b-0.12.2-statfs.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- k3b-0.12.2/libk3b/jobs/k3bcdcopyjob.cpp.statfs	2005-07-01 15:31:42.000000000 +0200
-+++ k3b-0.12.2/libk3b/jobs/k3bcdcopyjob.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -309,7 +309,7 @@
- 	  imageSpaceNeeded += (*it).length().mode1Bytes();
-       }
- 
--      unsigned long avail, size;
-+      unsigned long long avail, size;
-       QString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
-       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
---- k3b-0.12.2/libk3b/jobs/k3bdvdcopyjob.cpp.statfs	2005-07-01 15:31:42.000000000 +0200
-+++ k3b-0.12.2/libk3b/jobs/k3bdvdcopyjob.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -288,7 +288,7 @@
-       // check free temp space
-       //
-       KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048;
--      unsigned long avail, size;
-+      unsigned long long avail, size;
-       QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
-       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
- 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
---- k3b-0.12.2/libk3b/core/k3bglobals.h.statfs	2005-07-01 15:31:13.000000000 +0200
-+++ k3b-0.12.2/libk3b/core/k3bglobals.h	2005-07-13 14:42:08.000000000 +0200
-@@ -86,7 +86,7 @@
-    * We use this since we encountered problems with the KDE version.
-    * @returns true on success.
-    */
--  bool kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail );
-+  bool kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail );
- 
-   /**
-    * Cut a filename preserving the extension
---- k3b-0.12.2/libk3b/core/k3bglobals.cpp.statfs	2005-07-01 15:31:13.000000000 +0200
-+++ k3b-0.12.2/libk3b/core/k3bglobals.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -231,15 +231,15 @@
- }
- 
- 
--bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
-+bool K3b::kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail )
- {
-   struct statfs fs;
- 
-   if( ::statfs( QFile::encodeName(path), &fs ) == 0 ) {
--    unsigned long kBfak = fs.f_bsize/1024;
-+    // unsigned long kBfak = fs.f_bsize/1024;
- 
--    size = fs.f_blocks*kBfak;
--    avail = fs.f_bavail*kBfak;
-+    size = (fs.f_blocks*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
-+    avail = (fs.f_bavail*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
- 
-     return true;
-   }
---- k3b-0.12.2/src/k3bstatusbarmanager.cpp.statfs	2005-07-01 15:31:10.000000000 +0200
-+++ k3b-0.12.2/src/k3bstatusbarmanager.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -89,7 +89,7 @@
-   if( !QFile::exists( path ) )
-     path.truncate( path.findRev('/') );
- 
--  unsigned long size, avail;
-+  unsigned long long size, avail;
-   if( K3b::kbFreeOnFs( path, size, avail ) )
-     slotFreeTempSpace( path, size, 0, avail );
-   else
---- k3b-0.12.2/src/rip/k3bvideocdrippingdialog.h.statfs	2005-07-01 15:31:09.000000000 +0200
-+++ k3b-0.12.2/src/rip/k3bvideocdrippingdialog.h	2005-07-13 14:42:08.000000000 +0200
-@@ -66,7 +66,7 @@
-   void slotStartClicked();
- 
-   void slotUpdateFreeSpace();
--  void slotFreeSpace(const QString&, unsigned long, unsigned long, unsigned long);
-+  void slotFreeSpace(const QString&, unsigned long long, unsigned long long, unsigned long long);
- 
- };
- 
---- k3b-0.12.2/src/rip/k3bvideocdrippingdialog.cpp.statfs	2005-07-01 15:31:09.000000000 +0200
-+++ k3b-0.12.2/src/rip/k3bvideocdrippingdialog.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -188,9 +188,9 @@
- }
- 
- void K3bVideoCdRippingDialog::slotFreeSpace(const QString&,
--						  unsigned long,
--						  unsigned long,
--						  unsigned long kbAvail)
-+						  unsigned long long,
-+						  unsigned long long,
-+						  unsigned long long kbAvail)
- {
-     m_labelFreeSpace->setText( KIO::convertSizeFromKB(kbAvail) );
- 
-@@ -212,7 +212,7 @@
-     if( !QFile::exists( path ) )
-         path.truncate( path.findRev('/') );
- 
--    unsigned long size, avail;
-+    unsigned long long size, avail;
-     if( K3b::kbFreeOnFs( path, size, avail ) )
-         slotFreeSpace( path, size, 0, avail );
-     else
---- k3b-0.12.2/src/rip/k3baudioconvertingoptionwidget.cpp.statfs	2005-07-13 14:56:18.000000000 +0200
-+++ k3b-0.12.2/src/rip/k3baudioconvertingoptionwidget.cpp	2005-07-13 14:56:45.000000000 +0200
-@@ -141,7 +141,7 @@
-   if( !QFile::exists( path ) )
-     path.truncate( path.findRev('/') );
- 
--  unsigned long size, avail;
-+  unsigned long long size, avail;
-   if( K3b::kbFreeOnFs( path, size, avail ) ) {
-     m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
-     if( avail < d->neededSize/1024 )
---- k3b-0.12.2/src/rip/k3bdvdripperwidget.cpp.statfs	2005-07-01 15:31:09.000000000 +0200
-+++ k3b-0.12.2/src/rip/k3bdvdripperwidget.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -233,12 +233,17 @@
-     }
-     struct statfs fs;
-     ::statfs( QFile::encodeName( tmp ), &fs );
--    unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
--    slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
-+    unsigned long long size, used, avail;
-+    size = (fs.f_blocks * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    used = ((fs.f_blocks-fs.f_bfree) * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    avail = (fs.f_bavail * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
-+    slotFreeTempSpace( tmp, size, used, avail );
-+    // unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
-+    // slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
- }
- 
--void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long kBSize,
--        unsigned long kBUsed, unsigned long kBAvail ){
-+void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long long kBSize,
-+        unsigned long long kBUsed, unsigned long long kBAvail ){
-     m_fillDisplay->setKbSize( kBSize );
-     m_fillDisplay->setKbAvailable( kBAvail );
-     m_fillDisplay->setKbUsed( kBUsed );
---- k3b-0.12.2/src/rip/k3bdvdripperwidget.h.statfs	2005-07-01 15:31:09.000000000 +0200
-+++ k3b-0.12.2/src/rip/k3bdvdripperwidget.h	2005-07-13 14:42:08.000000000 +0200
-@@ -99,8 +99,8 @@
-   void rip();
-   void slotFindStaticDir();
-   void slotSetDependDirs( const QString& );
--  void slotFreeTempSpace( const QString & mountPoint, unsigned long kBSize,
--			 unsigned long kBUsed, unsigned long kBAvail );
-+  void slotFreeTempSpace( const QString & mountPoint, unsigned long long kBSize,
-+			 unsigned long long kBUsed, unsigned long long kBAvail );
-   void slotParseError( KProcess *p, char *text, int len );
-   void slotCheckOpenEncoding(int);
-   void slotOpenEncoding( bool );
---- k3b-0.12.2/src/k3btempdirselectionwidget.cpp.statfs	2005-07-01 15:31:10.000000000 +0200
-+++ k3b-0.12.2/src/k3btempdirselectionwidget.cpp	2005-07-13 14:42:08.000000000 +0200
-@@ -109,7 +109,7 @@
-   if( !QFile::exists( path ) )
-     path.truncate( path.findRev('/') );
- 
--  unsigned long size, avail;
-+  unsigned long long size, avail;
-   if( K3b::kbFreeOnFs( path, size, avail ) )
-     slotFreeTempSpace( path, size, 0, avail );
-   else
diff --git a/k3b-0.12.8-docsym.patch b/k3b-0.12.8-docsym.patch
deleted file mode 100644
index 78ec464..0000000
--- a/k3b-0.12.8-docsym.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- k3b-0.12.8/doc/Makefile.in.docsym	2006-05-31 15:23:22.000000000 +0200
-+++ k3b-0.12.8/doc/Makefile.in	2006-05-31 15:24:33.000000000 +0200
-@@ -541,7 +541,7 @@
- 	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/; \
- 	fi
- 	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
--	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
-+	$(LN_S) ../common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/common
- 
- uninstall-docs:
- 	-rm -rf $(kde_htmldir)/$(KDE_LANG)/k3b
---- k3b-0.12.8/admin/am_edit.docsym	2006-05-31 15:26:30.000000000 +0200
-+++ k3b-0.12.8/admin/am_edit	2006-05-31 15:26:57.000000000 +0200
-@@ -2028,7 +2028,7 @@
-       $lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
-       $lines .= "\tfi\n";
-       $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
--      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-+      $lines .= "\t\$(LN_S) ../common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
- 
-       $lines .= "\n";
-       $lines .= "uninstall-docs:\n";
diff --git a/k3b-scsi.patch b/k3b-scsi.patch
deleted file mode 100644
index 3c0c5bb..0000000
--- a/k3b-scsi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- k3b-0.11.9/libk3bdevice/k3bdevicemanager.cpp.foo	2004-05-04 01:27:41.922827652 -0400
-+++ k3b-0.11.9/libk3bdevice/k3bdevicemanager.cpp	2004-05-04 01:27:45.272397125 -0400
-@@ -488,7 +488,8 @@
-   }
- 
-   int bus = -1, target = -1, lun = -1;
--  bool scsi = determineBusIdLun( resolved, bus, target, lun );
-+  //bool scsi = determineBusIdLun( resolved, bus, target, lun );
-+  bool scsi = false;
-   if(scsi) {
-     if ( K3bDevice* oldDev = findDevice(bus, target, lun) ) {
-       kdDebug() << "(K3bDeviceManager) dev " << resolved  << " already found" << endl;
diff --git a/k3b.spec b/k3b.spec
index b642107..4671c9d 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -1,15 +1,20 @@
-%define tar_version 1.0
-%define i18n_version 1.0
+%define tar_version 1.0.1
+%define i18n_version 1.0.1
 
-Name: k3b
-Version: 1.0
-Release: 1%{?dist}
-Epoch: 0
+## distro/release specific support
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define _with_hal --with-hal
+%endif
+
+Name:    k3b
 Summary: CD/DVD burning application for KDE
+Epoch:   0
+Version: 1.0.1
+Release: 1%{?dist}
 
-Group: Applications/Archiving
+Group:   Applications/Archiving
 License: GPL
-URL: http://www.k3b.org
+URL:     http://www.k3b.org
 Source0: http://dl.sf.net/k3b/k3b-%{tar_version}.tar.bz2
 Source1: http://dl.sf.net/k3b/k3b-i18n-%{i18n_version}.tar.bz2
 Source2: k3brc
@@ -20,21 +25,35 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch: s390 s390x
 
-BuildRequires: kdelibs-devel >= 6:3.4, libart_lgpl-devel, arts-devel
-BuildRequires: qt-devel >= 3.3.4
-BuildRequires: zlib-devel, libpng-devel, libjpeg-devel
-BuildRequires: libvorbis-devel, audiofile-devel, flac-devel
-BuildRequires: desktop-file-utils symlinks
-BuildRequires: autoconf, gettext, automake, intltool
-BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel
-BuildRequires: libidn-devel hal-devel libmusicbrainz-devel
-# Deps from Extras
-#uildRequires: taglib-devel dbus-qt-devel libsamplerate-devel
-
-Requires: cdrecord mkisofs dvd+rw-tools cdrdao
+BuildRequires: kdelibs-devel 
+BuildRequires: desktop-file-utils
+BuildRequires: automake
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: libdvdread-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
+Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
+# imo, should be packaged separately, tis a shame to duplicate all this noarch
+# build/data on *every* arch.  -- Rex
+Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
-Obsoletes: k3b-extras <= 0:0.12.17-1.fc6
-Provides: k3b-extras = 0:0.12.17-2
+
+Requires: cdrecord mkisofs
+%if 0%{?fedora} > 3
+Requires(hint): cdrdao
+Requires(hint): dvd+rw-tools
+%endif
 
 %description
 K3b provides a comfortable user interface to perform most CD/DVD
@@ -51,31 +70,46 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 %description devel
 Files for the development of applications, which will use k3b.
 
+
 %prep
 %setup -q -a 1 -n %{name}-%{tar_version}
+
 pushd %{name}-i18n-%{i18n_version}
 %patch1 -p2 -b .lns
+#aclocal
+#autoconf
+make -f admin/Makefile.common
 popd
-# Make desktop icon file names compatible with GNOME.
-sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop k3bsetup/k3bsetup2.desktop
+
 
 %build
-unset QTDIR
-. /etc/profile.d/qt.sh
-export QTLIB=$QTDIR/lib
-#aclocal
-#autoconf
-%configure --with-k3bsetup=no --disable-rpath
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
+%configure \
+  --includedir=%{_includedir}/k3b \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
+  --with-k3bsetup=no \
+  --with-oggvorbis \
+  --with-flac \
+  --with-external-libsamplerate \
+  --with-musicbrainz \
+  --with-sndfile \
+  --without-ffmpeg --without-lame --without-libmad \
+  --with-musepack \
+  %{?_with_hal} %{!?_with_hal:--without-hal} 
+
 make %{?_smp_mflags}
 
 # Build for i18n tarball
 pushd %{name}-i18n-%{i18n_version}
-aclocal
-autoconf
 %configure
 make %{?_smp_mflags}
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -85,33 +119,17 @@ pushd %{name}-i18n-%{i18n_version}
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/config
-%{__install} -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
+%{__install} -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
 
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor kde --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+# what's X-Red-Hat-Base for?  -- Rex
+desktop-file-install --vendor="" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
   --add-category X-Red-Hat-Base \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-# Empty directories.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
-
 # remove the .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la 
 
-# Test, if k3b works before removing these plugin .la files
-# rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
-
-# move include files to a subdir
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/k3b
-mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT%{_includedir}/k3b 2>/dev/null
-
-# GNOME desktop beautification (requires "Icon=name.png" fix in setup section).
-mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png
-
 # remove i18n for Plattdeutsch (Low Saxon)
 rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/nds
 
@@ -124,26 +142,38 @@ for i in *; do
 done
 popd
 
-%find_lang %{name}
+%find_lang %{name} 
 %find_lang k3bsetup
 %find_lang libk3b
 %find_lang libk3bdevice
 
 cat k3bsetup.lang libk3b.lang libk3bdevice.lang >> %{name}.lang
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 
-%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root,755)
-%doc AUTHORS README COPYING TODO INSTALL ChangeLog
-%{_bindir}/%{name}
-%{_datadir}/applications/*.desktop
+%doc AUTHORS README COPYING TODO ChangeLog
+%{_bindir}/k3b
+%{_datadir}/applications/kde/%{name}.desktop
+# FIXME/TODO: move under %_datadir/applications, add Hidden=True attribute.
+%{_datadir}/applnk/.hidden/*.desktop
 
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_libdir}/libk3b*.so.*
@@ -154,14 +184,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/services/kfile_k3b.desktop
 %{_datadir}/services/videodvd.protocol
 
-
-%{_datadir}/apps/k3b
+%{_datadir}/apps/k3b/
 %{_datadir}/apps/konqueror/servicemenus/*
 %{_datadir}/config/*
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/sounds/*
-%dir %{_datadir}/icons/hicolor/*/apps
-%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/*/*
 %doc %{_docdir}/HTML/en/*
 
 # files from i18n
@@ -185,10 +212,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,755)
 %doc %{name}-i18n-%{i18n_version}/README 
 %doc %{name}-i18n-%{i18n_version}/COPYING 
-%{_includedir}/k3b
+%{_includedir}/k3b/
 %{_libdir}/libk3b*.so
 
+
 %changelog
+* Thu Jun  7 2007 Harald Hoyer <harald@redhat.com> - 0:1.0.1-1
+- k3b-1.0.1 update release for F-7
+
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-2
+- respin (for libmpcdec)
+
+* Wed May 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-1
+- k3b-1.0.1
+- include icon/mime scriptlets
+- cleanup/simplify BR's
+- optimize %%configure
+- restore applnk/.hidden bits
+
 * Wed Apr 11 2007 Harald Hoyer <harald@redhat.com> - 0:1.0-1
 - version k3b-1.0
 - provide/obsolete k3b-extras
diff --git a/sources b/sources
index a2cf20d..fabe51a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-02bf955059adfe9ac8a11d36fb34a11c  k3b-1.0.tar.bz2
-19534f984a9846b50bf027d1a9ce4988  k3b-i18n-1.0.tar.bz2
+8abd11f56e6e40d6f2d0b076a5f8b8ed  k3b-1.0.1.tar.bz2
+f87a27408a4153d860103816ba83db09  k3b-i18n-1.0.1.tar.bz2