SPECS (AC-branch): k3b.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Wed May 17 15:41:07 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   k3b.spec (1.117 -> 1.117.2.1) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.117 SPECS/k3b.spec:1.117.2.1
--- SPECS/k3b.spec:1.117	Wed Nov 30 19:52:25 2005
+++ SPECS/k3b.spec	Wed May 17 17:40:58 2006
@@ -10,19 +10,18 @@
 Summary:	The CD Kreator
 Summary(pl):	Kreator CD
 Name:		k3b
-Version:	0.12.8
+Version:	0.12.15
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
-# Source0-md5:	dff0c2075266e6ad5d3c4ad99bcf8a54
+# Source0-md5:	246607f9d63b94c7f91ac86c108efdc2
 Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
-# Source1-md5:	eea7b0026cc1c34c4ca4bdd09d0eda0d
+# Source1-md5:	6cbfd080b3684efae0ed4b4797b5cecb
 Patch0:		%{name}-linux22.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-group.patch
 URL:		http://www.k3b.org/
-BuildRequires:	acl-devel
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.9.4
@@ -33,6 +32,7 @@
 BuildRequires:	hal-devel >= 0.4
 BuildRequires:	kdelibs-devel >= %{_kdever}
 BuildRequires:	lame-libs-devel
+BuildRequires:	libgsm-devel
 BuildRequires:	libmpcdec-devel
 BuildRequires:	libmusicbrainz-devel
 BuildRequires:	libsamplerate-devel
@@ -43,6 +43,7 @@
 BuildRequires:	taglib-devel
 Requires:	cdrdao >= 1.1.5
 Requires:	cdrecord
+Requires:	kdelibs
 Requires:	mkisofs
 %if %{with reqs}
 Requires:	normalize
@@ -88,7 +89,10 @@
 Summary(pl):	Pliki nagłówkowe biblioteki libk3bcore
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	dbus-qt-devel
+Requires:	hal-devel
 Requires:	kdelibs-devel
+Requires:	libsamplerate-devel
 %{?with_resmgr:Requires:	resmgr-devel}
 
 %description devel
@@ -245,6 +249,18 @@
 Pakiet zawiera wtyczki (a dokładniej "servicemenus") rozszerzające
 funkcjonalność Konquerora.
 
+%package plugin-output-alsa
+Summary:	Plugin - ALSA support
+Summary(pl):	Wtyczka - obsługa ALSA
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-output-alsa
+Audio Output plugin which plays through ALSA.
+
+%description plugin-output-alsa -l pl
+Wtyczka odtwarzania dźwięku przez ALSA.
+
 %package plugin-output-arts
 Summary:	Plugin - arts support
 Summary(pl):	Wtyczka - obsługa arts
@@ -282,10 +298,10 @@
 %{__make} -f admin/Makefile.common
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
-	--disable-rpath \
+	%{!?debug:--disable-rpath} \
+	%{!?with_setup:--with-k3bsetup=no} \
 	--with-qt-libraries=%{_libdir} \
-	%{!?with_resmgr:--without-resmgr} \
-	%{!?with_setup:--with-k3bsetup=no}
+	%{!?with_resmgr:--without-resmgr}
 
 %{__make}
 
@@ -297,6 +313,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_includedir}/libisofs
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -308,6 +325,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
+install libk3b/tools/libisofs/*.h $RPM_BUILD_ROOT%{_includedir}/libisofs
+
 %find_lang %{name} --all-name --with-kde
 
 %clean
@@ -324,8 +343,8 @@
 %{_datadir}/applnk/.hidden/*.desktop
 %dir %{_datadir}/apps/k3b
 %dir %{_datadir}/apps/k3b/plugins
-%{_datadir}/apps/k3b/*
-%exclude %{_datadir}/apps/k3b/plugins/*
+%{_datadir}/apps/k3b/[!p]*
+%{_datadir}/apps/k3b/pics
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_datadir}/sounds/*.wav
 %{_desktopdir}/kde/k3b.desktop
@@ -345,6 +364,7 @@
 %{_libdir}/libk3b.la
 %{_libdir}/libk3bdevice.la
 %{_includedir}/*.h
+%{_includedir}/libisofs
 
 %files plugin-decoder-ffmpeg
 %defattr(644,root,root,755)
@@ -416,6 +436,12 @@
 %defattr(644,root,root,755)
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 
+%files plugin-output-alsa
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/kde3/libk3balsaoutputplugin.so
+%{_libdir}/kde3/libk3balsaoutputplugin.la
+%{_datadir}/apps/k3b/plugins/k3balsaoutputplugin.plugin
+
 %files plugin-output-arts
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde3/libk3bartsoutputplugin.so
@@ -437,6 +463,51 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117.2.1  2006/05/17 15:40:58  baggins
+- merged from HEAD
+
+Revision 1.131  2006/04/11 23:06:28  charles
+- updated to 0.12.15
+
+Revision 1.130  2006/04/02 21:27:07  paszczus
+- reverted...
+
+Revision 1.128  2006/03/09 09:09:07  zawadaa
+- up to 0.12.14, STBR
+
+Revision 1.127  2006/03/03 18:27:22  tiwek
+- added kdelibs to Req.
+
+Revision 1.126  2006/03/02 23:05:00  charles
+- updated to 0.12.13
+
+Revision 1.125  2006/02/20 21:09:42  wolf
+- BR: libgsm-devel
+
+Revision 1.124  2006/02/18 09:20:48  charles
+- added libisofs/*.h to -devel
+- -devel R: dbus-qt-devel, hal-devel, libsamplerate-devel
+
+Revision 1.123  2006/02/15 17:28:21  wolf
+- 0.12.12
+
+Revision 1.122  2006/02/10 21:09:35  wolf
+- 0.12.11
+
+Revision 1.121  2005/12/16 23:04:53  adgor
+- Fixed %files (listed twice)
+- Fixed %configure
+
+Revision 1.120  2005/12/16 14:14:02  paszczus
+- updated to 0.12.10
+
+Revision 1.119  2005/12/12 15:26:21  charles
+- updated to 0.12.9
+- added -plugin-output-alsa
+
+Revision 1.118  2005/12/03 16:24:01  qboosh
+- acl is kdelibs dependency
+
 Revision 1.117  2005/11/30 18:52:25  jack
 - add BR acl-devel
 
================================================================

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