Author: hawk Date: Mon Mar 19 15:11:49 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged version 1.0 from HEAD
---- Files affected: SPECS: k3b.spec (1.137.2.1.2.4 -> 1.137.2.1.2.5) ---- Diffs: ================================================================ Index: SPECS/k3b.spec diff -u SPECS/k3b.spec:1.137.2.1.2.4 SPECS/k3b.spec:1.137.2.1.2.5 --- SPECS/k3b.spec:1.137.2.1.2.4 Fri Jan 26 19:09:08 2007 +++ SPECS/k3b.spec Mon Mar 19 16:11:43 2007 @@ -11,22 +11,16 @@ Summary: The CD Kreator Summary(pl): Kreator CD Name: k3b -Version: 0.12.17 -Release: 4 +Version: 1.0 +Release: 1 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 -Patch6: k3b-flac.patch -Patch7: kde-common-LD_quote.patch +# Source0-md5: 02bf955059adfe9ac8a11d36fb34a11c +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 @@ -38,6 +32,7 @@ %{?with_hal:BuildRequires: hal-devel >= 0.4} BuildRequires: kdelibs-devel >= %{_kdever} BuildRequires: lame-libs-devel +BuildRequires: libdvdread-devel BuildRequires: libgsm-devel BuildRequires: libmpcdec-devel BuildRequires: libmusicbrainz-devel @@ -46,6 +41,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 @@ -57,6 +53,8 @@ %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq libtool(.*) + %description The CD Kreator features: - the most userfriendly interface ever ;-) @@ -94,9 +92,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} @@ -293,24 +292,17 @@ Plugin. %prep -%setup -q -a1 -%{?with_linux22:%patch0 -p1} +%setup -q +%patch0 -p0 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 - -cd k3b-i18n-%{version} -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch7 -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 \ @@ -322,12 +314,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 @@ -338,10 +324,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 @@ -360,6 +342,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 @@ -378,6 +363,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 @@ -480,6 +469,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.137.2.1.2.5 2007/03/19 15:11:43 hawk +- merged version 1.0 from HEAD + Revision 1.137.2.1.2.4 2007/01/26 18:09:08 glen - add -flac and ld quote patches; rel 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/k3b.spec?r1=1.137.2.1.2.4&r2=1.137.2.1.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
