Mailinglist Archive: opensuse-commit (1426 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package k3b
checked in at Thu Mar 29 00:44:13 CEST 2007.

--------
--- KDE/k3b/k3b.changes 2007-03-16 21:00:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/k3b/k3b.changes        2007-03-28 15:31:23.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Mar 28 15:29:40 CEST 2007 - stbinner@xxxxxxx
+
+- merge internal k3b-mad subpackage into k3b-INTERNAL package
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ k3b.spec ++++++
--- /var/tmp/diff_new_pack.i23348/_old  2007-03-29 00:41:27.000000000 +0200
+++ /var/tmp/diff_new_pack.i23348/_new  2007-03-29 00:41:27.000000000 +0200
@@ -25,7 +25,7 @@
 Summary:        A Universal CD and DVD Burning Application
 Requires:       /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
 Version:        1.0
-Release:        1
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %name-%version.tar.bz2
 Source1:        %name-i18n-%version.tar.bz2
@@ -57,22 +57,6 @@
     Sebastian Trueg <trueg@xxxxxxxxxxxxxxxxxxxxxxxxxx>
     Thomas Froescher <tfroescher@xxxxxx>
 
-%package mad
-Group:          Productivity/Multimedia/CD/Record
-Summary:        MP3 support for k3b
-Provides:       k3b:/opt/kde3/share/apps/k3b/plugins/k3bmaddecoder.plugin
-
-%description mad
-K3B can handle directly MP3 files with this plugin. For example to burn
-an Audio-CD.
-
-
-
-Authors:
---------
-    Sebastian Trueg <trueg@xxxxxxxxxxxxxxxxxxxxxxxxxx>
-    Thomas Froescher <tfroescher@xxxxxx>
-
 %package arts
 Group:          Productivity/Multimedia/CD/Record
 Summary:        aRts sound output for k3b
@@ -90,6 +74,8 @@
 %package INTERNAL
 Group:          Productivity/Multimedia/CD/Record
 Summary:        mp3 encoding and video decoding/encoding plugins
+Provides:       k3b:/opt/kde3/share/apps/k3b/plugins/k3bmaddecoder.plugin
+Provides:       k3b-mad:/opt/kde3/%_lib/kde3/libk3bmaddecoder.so
 
 %description INTERNAL
 **** SuSE INTERNAL PACKAGE ****
@@ -212,17 +198,16 @@
 %if %{?opensuse_bs:1}0
 %else
 
-%files mad
-%defattr(-,root,root)
-/opt/kde3/%_lib/kde3/libk3bmaddecoder.*
-
 %files INTERNAL
 %defattr(-,root,root)
+/opt/kde3/%_lib/kde3/libk3bmaddecoder.*
 /opt/kde3/%_lib/kde3/libk3bffmpegdecoder.*
 /opt/kde3/%_lib/kde3/libk3blameencoder.*
 %endif
 
 %changelog
+* Wed Mar 28 2007 - stbinner@xxxxxxx
+- merge internal k3b-mad subpackage into k3b-INTERNAL package
 * Fri Mar 16 2007 - stbinner@xxxxxxx
 - update to final 1.0 release, include i18n tarball
 * Tue Mar 13 2007 - dmueller@xxxxxxx



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx