SPECS (DEVEL): k3b.spec - up to 1.0pre1

[shadzik]

Author: shadzik                      Date: Tue Aug  8 00:36:34 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 1.0pre1

---- Files affected:
SPECS:
   k3b.spec (1.133 -> 1.133.2.1) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.133 SPECS/k3b.spec:1.133.2.1
--- SPECS/k3b.spec:1.133	Thu Jun 29 06:59:41 2006
+++ SPECS/k3b.spec	Tue Aug  8 02:36:29 2006
@@ -8,17 +8,16 @@
 %bcond_without	setup		# don't build K3bSetup2 KControl Module
 #
 %define		_kdever		9:3.2
+%define		_pre	pre1
 Summary:	The CD Kreator
 Summary(pl):	Kreator CD
 Name:		k3b
-Version:	0.12.16
-Release:	1
+Version:	1.0
+Release:	0.%{_pre}.1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
-# Source0-md5:	cac9b8230295c1756581399b3bbd0687
-Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
-# Source1-md5:	1dc3edf8afff8b1c9064b42335a61add
+Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}%{_pre}.tar.bz2
+# Source0-md5:	6abafc955bd7678bf951276b498f30d9
 Patch0:		%{name}-linux22.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-group.patch
@@ -289,14 +288,15 @@
 Audio Metainfo Renamer, Cddb Audio Plugin.
 
 %prep
-%setup -q -a1
+%setup -q -n %{name}-%{version}%{_pre}
 %{?with_linux22:%patch0 -p1}
-%patch1 -p1
+%patch1 -p0
 %patch2 -p1
+%{__sed} -i -e s/"#MIN_CONFIG(3.4)"/"#MIN_CONFIG(3.3)"/g configure.in.in
 
 %build
 cp -f /usr/share/automake/config.sub admin
-%{__make} -f admin/Makefile.common
+#%{__make} -f admin/Makefile.common
 %configure \
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	%{!?debug:--disable-rpath} \
@@ -307,12 +307,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
@@ -323,10 +317,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
@@ -345,6 +335,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
@@ -363,6 +356,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
@@ -465,6 +462,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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.133&r2=1.133.2.1&f=u