This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2006-09-09 10:49:22 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode'
Cherrypick from unlabeled-1.137.2 2006-08-26 17:09:44 UTC shadzik <shadzik@pld-linux.org> '- 0.12.17; started new AC-branch; spec with BR dbus-qt-devel >= 0.62':
    k3b.spec -> 1.137.2.1
Delete:
    k3b-desktop.patch
    kde-ac260.patch

diff --git a/k3b-desktop.patch b/k3b-desktop.patch
deleted file mode 100644 (file)
index eb33f43..0000000
--- a/k3b-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aurN k3b-0.12.orig/src/k3b.desktop k3b-0.12/src/k3b.desktop
---- k3b-0.12.orig/src/k3b.desktop      2005-06-14 19:05:49.000000000 +0200
-+++ k3b-0.12/src/k3b.desktop   2005-06-14 19:06:26.000000000 +0200
-@@ -80,5 +80,5 @@
- MimeType=application/x-k3b
- X-KDE-StartupNotify=true
- X-KDE-NativeMimeType=application/x-k3b
--Categories=KDE;Application;AudioVideo;DiscBurning;
-+Categories=Qt;KDE;AudioVideo;DiscBurning;
- X-DCOP-ServiceType=Unique
-diff -aurN k3b-0.12.orig/k3bsetup/k3bsetup2.desktop k3b-0.12/k3bsetup/k3bsetup2.desktop
---- k3b-0.12.orig/k3bsetup/k3bsetup2.desktop   2005-06-13 10:00:42.000000000 +0200
-+++ k3b-0.12/k3bsetup/k3bsetup2.desktop        2005-06-14 19:00:07.000000000 +0200
-@@ -58,7 +58,7 @@
- X-KDE-Library=k3bsetup2
- X-KDE-ModuleType=Library
- X-KDE-RootOnly=true
--Categories=Application;System;X-KDE-System;
-+Categories=Qt;KDE;X-KDE-settings-system;
- GenericName=CD & DVD Burning Setup
- GenericName[bg]=Настройка на записа на CD и DVD
- GenericName[cs]=Nastavení vypalování CD a DVD

diff --git a/k3b.spec b/k3b.spec
index 3649828e0a0301b231729c0caf3cde44cc276a09..131077e58b233c1722142ae5a59feaae5ef37c62 100644 (file)
--- a/k3b.spec
+++ b/k3b.spec
@@ -11,7 +11,7 @@ Summary:      The CD Kreator
 Summary(pl):   Kreator CD
 Name:          k3b
 Version:       0.12.17
-Release:       1.1
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
@@ -26,7 +26,7 @@ URL:          http://www.k3b.org/
 BuildRequires: arts-qt-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.9.4
-BuildRequires: dbus-qt-devel >= 0.70
+BuildRequires: dbus-qt-devel >= 0.62
 BuildRequires: ffmpeg-devel >= 0.4.9
 BuildRequires: flac-devel >= 1.1.2
 BuildRequires: gettext-devel

diff --git a/kde-ac260.patch b/kde-ac260.patch
deleted file mode 100644 (file)
index 17567e3..0000000
--- a/kde-ac260.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dbus-1-qt3-0.2/admin/cvs.sh.wigeta 2006-08-17 20:33:33.000000000 +0200
-+++ dbus-1-qt3-0.2/admin/cvs.sh        2006-08-17 20:34:23.000000000 +0200
-@@ -32,7 +32,7 @@
- required_autoconf_version="2.53 or newer"
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
- case $AUTOCONF_VERSION in
--  Autoconf*2.5* | autoconf*2.5* ) : ;;
-+  Autoconf*2.[56]* | autoconf*2.[56]* ) : ;;
-   "" )
-     echo "*** AUTOCONF NOT FOUND!."
-     echo "*** KDE requires autoconf $required_autoconf_version"
-@@ -47,7 +47,7 @@
- 
- AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
- case $AUTOHEADER_VERSION in
--  Autoconf*2.5* | autoheader*2.5* ) : ;;
-+  Autoconf*2.[56]* | autoheader*2.[56]* ) : ;;
-   "" )
-     echo "*** AUTOHEADER NOT FOUND!."
-     echo "*** KDE requires autoheader $required_autoconf_version"