SPECS: k3b.spec - merged from DEVEL

Sat Dec 23 22:57:44 CET 2006

Author: arekm                        Date: Sat Dec 23 21:57:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   k3b.spec (1.140 -> 1.141) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.140 SPECS/k3b.spec:1.141

--- SPECS/k3b.spec:1.140	Mon Dec 11 11:11:45 2006
+++ SPECS/k3b.spec	Sat Dec 23 22:57:39 2006
@@ -1,30 +1,25 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	linux22		# building on kernel 2.2.x
 %bcond_with	reqs		# force optional Requires
 %bcond_without	hal		# build without hal support
 %bcond_without	resmgr		# build without ResMgr support
 %bcond_without	setup		# don't build K3bSetup2 KControl Module
 #
 %define		_kdever		9:3.2
+%define		_pre	rc2
 Summary:	The CD Kreator
 Summary(pl):	Kreator CD
 Name:		k3b
-Version:	0.12.17
-Release:	2
+Version:	1.0
+Release:	0.%{_pre}.2
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
-# Source0-md5:	e7d423fe386fe0cab7aec6034eb33316
-Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
-# Source1-md5:	f9de0fb3ce91fa572f4f0fd24dcfe2f2
-Patch0:		%{name}-linux22.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-group.patch
-Patch3:		kde-ac260.patch
-Patch4:		kde-ac260-lt.patch
-Patch5:		kde-am.patch
+Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}%{_pre}.tar.bz2
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-group.patch
+Patch2:		%{name}-dbus.patch
+Patch3:		%{name}-libadd.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -33,9 +28,10 @@
 BuildRequires:	ffmpeg-devel >= 0.4.9
 BuildRequires:	flac-devel >= 1.1.2
 BuildRequires:	gettext-devel
-%{?with_hal:BuildRequires:	hal-devel >= 0.4}
+%{?with_hal:BuildRequires:	hal-devel >= 0.5}
 BuildRequires:	kdelibs-devel >= %{_kdever}
 BuildRequires:	lame-libs-devel
+BuildRequires:	libdvdread-devel
 BuildRequires:	libgsm-devel
 BuildRequires:	libmpcdec-devel
 BuildRequires:	libmusicbrainz-devel
@@ -44,6 +40,7 @@
 BuildRequires:	pkgconfig
 %{?with_resmgr:BuildRequires:	resmgr-devel}
 BuildRequires:	rpmbuild(macros) >= 1.129
+BuildRequires:	sed >= 4.0
 BuildRequires:	taglib-devel
 Requires:	cdrdao >= 1.1.5
 Requires:	cdrecord
@@ -55,6 +52,8 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define         _noautoreq      libtool(.*)
+
 %description
 The CD Kreator features:
  - the most userfriendly interface ever ;-)
@@ -92,9 +91,10 @@
 Summary(pl):	Pliki nagłówkowe biblioteki libk3bcore
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	dbus-qt-devel
+Requires:	dbus-qt3-devel >= 0.2
 Requires:	hal-devel
 Requires:	kdelibs-devel
+Requires:	libdvdread-devel
 Requires:	libsamplerate-devel
 %{?with_resmgr:Requires:	resmgr-devel}
 
@@ -291,20 +291,17 @@
 Plugin.
 
 %prep
-%setup -q -a1
-%{?with_linux22:%patch0 -p1}
+%setup -q -n %{name}-%{version}%{_pre}
+%patch0 -p0
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-cd k3b-i18n-%{version}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
+cp -f /usr/share/libtool/ltmain.sh admin
+: > admin/libtool.m4.in
+rm -f acinclude.m4
 %{__make} -f admin/Makefile.common
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
@@ -316,12 +313,6 @@
 
 %{__make}
 
-cd %{name}-i18n-%{version}
-cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common
-%configure
-%{__make}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/libisofs
@@ -332,10 +323,6 @@
 	k3bsetup2dir=%{_desktopdir}/kde \
 	kde_htmldir=%{_kdedocdir}
 
-%{__make} install -C %{name}-i18n-%{version} \
-	DESTDIR=$RPM_BUILD_ROOT \
-	kde_htmldir=%{_kdedocdir}
-
 install libk3b/tools/libisofs/*.h $RPM_BUILD_ROOT%{_includedir}/libisofs
 
 %find_lang %{name} --all-name --with-kde
@@ -354,6 +341,9 @@
 %{_datadir}/applnk/.hidden/*.desktop
 %dir %{_datadir}/apps/k3b
 %dir %{_datadir}/apps/k3b/plugins
+%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{_datadir}/services/kfile_k3b.desktop
+%{_datadir}/services/videodvd.protocol
 %{_datadir}/apps/k3b/[!p]*
 %{_datadir}/apps/k3b/pics
 %{_datadir}/mimelnk/application/x-k3b.desktop
@@ -372,6 +362,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libk3b.so
 %attr(755,root,root) %{_libdir}/libk3bdevice.so
+%{_libdir}/kde3/kfile_k3b.la
+%attr(755,root,root) %{_libdir}/kde3/kfile_k3b.so
+%{_libdir}/kde3/kio_videodvd.la
+%attr(755,root,root) %{_libdir}/kde3/kio_videodvd.so
 %{_libdir}/libk3b.la
 %{_libdir}/libk3bdevice.la
 %{_includedir}/*.h
@@ -474,6 +468,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141  2006/12/23 21:57:39  arekm
+- merged from DEVEL
+
 Revision 1.140  2006/12/11 10:11:45  glen
 - merge with AC-branch
 
@@ -494,6 +491,63 @@
 
 Revision 1.134  2006/08/19 21:36:00  arekm
 - rel 2; dbus-qt3 br
+
+Revision 1.133.2.17  2006/12/18 11:27:08  arekm
+- noautoreq libtool
+
+Revision 1.133.2.16  2006/12/18 11:26:29  arekm
+- rel .2; rebuild with new ffmpeg
+
+Revision 1.133.2.15  2006/12/13 20:27:20  shadzik
+- rc2
+
+Revision 1.133.2.14  2006/12/12 23:29:03  shadzik
+- BR hal >= 0.5
+
+Revision 1.133.2.13  2006/12/12 23:25:15  shadzik
+- rc1
+
+Revision 1.133.2.12  2006/11/21 20:29:28  shadzik
+- up to beta1
+- no need for kde-ac260.patch
+
+Revision 1.133.2.11  2006/09/18 12:16:08  shadzik
+- remove R: kdelibs, it's taken from BR
+
+Revision 1.133.2.10  2006/09/08 14:58:57  adgor
+- -devel R: libdvdread-devel
+
+Revision 1.133.2.9  2006/09/06 16:19:32  shadzik
+- forgot to remove qt336.patch, done
+
+Revision 1.133.2.8  2006/09/06 16:17:49  shadzik
+- 1.0pre2
+- dbus-qt3 -> dbus-qt
+
+Revision 1.133.2.7  2006/08/18 17:46:27  wiget
+- added libadd.patch (fix linking if --as-needed is used)
+- use system libtool
+
+Revision 1.133.2.6  2006/08/18 12:04:12  wiget
+- added dbus.patch (search for dbus-qt3 not dbus-qt)
+
+Revision 1.133.2.5  2006/08/18 11:21:24  wiget
+- added kde-ac260.patch (common patch for all KDE related spec - allow autoconf 2.60)
+- added qt336.patch (sed2patch)
+- build with dbus-qt3
+
+Revision 1.133.2.4  2006/08/10 10:24:32  shadzik
+- BR: sed, quote sed expresion
+
+Revision 1.133.2.3  2006/08/08 16:55:50  vip
+- missing BR: libdvdread-devel
+
+Revision 1.133.2.2  2006/08/08 00:46:59  shadzik
+- uncomment make -f admin/Makefile.common cvs, without that a buggy ./configure script is used
+  and the whole thing fails on build
+
+Revision 1.133.2.1  2006/08/08 00:36:29  shadzik
+- up to 1.0pre1
 
 Revision 1.133  2006/06/29 04:59:41  charles
 - bcond without hal
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/k3b.spec?r1=1.140&r2=1.141&f=u

