rpms/k3b/F-9 k3b-1.0.4-manualbufsize.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 k3b.spec, 1.57, 1.58 k3brc, 1.1, 1.2 sources, 1.20, 1.21

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4702/F-9

Modified Files:
	.cvsignore k3b.spec k3brc sources 
Added Files:
	k3b-1.0.4-manualbufsize.patch 
Log Message:
sync w/rawhide (k3b-1.0.5)


k3b-1.0.4-manualbufsize.patch:

--- NEW FILE k3b-1.0.4-manualbufsize.patch ---
diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
--- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize	2007-11-02 10:55:39.000000000 +0100
+++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp	2008-04-22 14:15:06.000000000 +0200
@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
   : m_eject(true),
     m_burnfree(true),
     m_overburn(false),
-    m_useManualBufferSize(false),
+    m_useManualBufferSize(true),
     m_bufferSize(4),
     m_force(false)
 {
@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
   m_eject = !c->readBoolEntry( "No cd eject", false );
   m_burnfree = c->readBoolEntry( "burnfree", true );
   m_overburn = c->readBoolEntry( "Allow overburning", false );
-  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
+  m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
   m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
   m_force = c->readBoolEntry( "Force unsafe operations", false );
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	5 Nov 2007 17:52:03 -0000	1.19
+++ .cvsignore	25 Jun 2008 18:45:24 -0000	1.20
@@ -1,2 +1,2 @@
-k3b-i18n-1.0.4.tar.bz2
-k3b-1.0.4.tar.bz2
+k3b-1.0.5.tar.bz2
+k3b-i18n-1.0.5.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/k3b.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- k3b.spec	19 Feb 2008 15:08:41 -0000	1.57
+++ k3b.spec	25 Jun 2008 18:45:24 -0000	1.58
@@ -13,27 +13,29 @@
 Name:    k3b
 Summary: CD/DVD burning application for KDE
 Epoch:   0
-Version: 1.0.4
-Release: 7%{?dist}
+Version: 1.0.5
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org
 Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
 Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# TODO: bugzilla/document
+ExcludeArch: s390 s390x
+
 Source2: k3brc
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
 Patch2: k3b-1.0.3-umount.patch
 # http://bugs.kde.org/151816 , k3b can't reload media for verification
 Patch3: k3b-1.0.4-kde#151816.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# TODO: bugzilla/document
-ExcludeArch: s390 s390x
+Patch4: k3b-1.0.4-manualbufsize.patch
 
 BuildRequires: kdelibs3-devel 
 BuildRequires: desktop-file-utils
+# needed by patch1
 BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
@@ -63,6 +65,7 @@
 %if 0%{?fedora} > 3
 Requires(hint): cdrdao
 Requires(hint): dvd+rw-tools
+#Requires(hint): gnome-mount
 %endif
 
 %description
@@ -73,7 +76,8 @@
 start.
 
 %if 0%{?devel}
-# afaik, nobody BR's it, and it pulls k3b into multilib -- Rex
+# afaik, nobody BR's it, and it pulls k3b into multilib.
+# when/if this is ever needed, consider -libs subpkg -- Rex
 %package devel
 Summary: Files for the development of applications which will use %{name} 
 Group: Development/Libraries
@@ -86,16 +90,16 @@
 %prep
 %setup -q -a 1 -n %{name}-%{version}
 
+%patch2 -p1 -b .umount
+%patch3 -p1 -b .kde#151816
+# set in k3brc instead
+#patch4 -p1 -b .manualbufsize
+
 pushd %{name}-i18n-%{version}
 %patch1 -p2 -b .lns
-#aclocal
-#autoconf
 make -f admin/Makefile.common
 popd
 
-%patch2 -p1 -b .umount
-%patch3 -p1 -b .kde#151816
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -170,7 +174,6 @@
 %endif
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -208,35 +211,47 @@
 %{_datadir}/config/*
 %{_datadir}/sounds/*
 %{_datadir}/icons/hicolor/*/*/*
-%doc %{_docdir}/HTML/en/*
+%doc %{_docdir}/HTML/en/%{name}/*
 
 # files from i18n
-%lang(da) %doc %{_docdir}/HTML/da/*
-%lang(de) %doc %{_docdir}/HTML/de/*
-%lang(en) %doc %{_docdir}/HTML/en/*
-%lang(es) %doc %{_docdir}/HTML/es/*
-%lang(et) %doc %{_docdir}/HTML/et/*
-%lang(fr) %doc %{_docdir}/HTML/fr/*
-%lang(it) %doc %{_docdir}/HTML/it/*
-%lang(nl) %doc %{_docdir}/HTML/nl/*
-%lang(pt) %doc %{_docdir}/HTML/pt/*
-%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/*
-%lang(ru) %doc %{_docdir}/HTML/ru/*
-%lang(sv) %doc %{_docdir}/HTML/sv/*
-%lang(uk) %doc %{_docdir}/HTML/uk/*
-%lang(pl) %doc %{_docdir}/HTML/pl/*
+%lang(da) %doc %{_docdir}/HTML/da/%{name}/*
+%lang(de) %doc %{_docdir}/HTML/de/%{name}/*
+%lang(en) %doc %{_docdir}/HTML/en/%{name}/*
+%lang(es) %doc %{_docdir}/HTML/es/%{name}/*
+%lang(et) %doc %{_docdir}/HTML/et/%{name}/*
+%lang(fr) %doc %{_docdir}/HTML/fr/%{name}/*
+%lang(it) %doc %{_docdir}/HTML/it/%{name}/*
+%lang(nl) %doc %{_docdir}/HTML/nl/%{name}/*
+%lang(pt) %doc %{_docdir}/HTML/pt/%{name}/*
+%lang(pt_BR) %doc %{_docdir}/HTML/pt_BR/%{name}/*
+%lang(ru) %doc %{_docdir}/HTML/ru/%{name}/*
+%lang(sv) %doc %{_docdir}/HTML/sv/%{name}/*
+%lang(uk) %doc %{_docdir}/HTML/uk/%{name}/*
+%lang(pl) %doc %{_docdir}/HTML/pl/%{name}/*
 
 %if 0%{?devel}
 %files devel
-%defattr(-,root,root,755)
-%doc %{name}-i18n-%{version}/README 
-%doc %{name}-i18n-%{version}/COPYING 
+%defattr(-,root,root,-)
 %{_includedir}/k3b/
 %{_libdir}/libk3b*.so
 %endif
 
 
 %changelog
+* Sat May 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-2
+- (re)enable reload patch
+
+* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-1
+- k3b-1.0.5
+- k3brc: set manual buffer size here
+- omit reload patch (for now), to verify if still needed.
+
+* Wed May  7 2008 Roman Rakus <rrakus at redhat.cz> - 0:1.0.4-9
+- Fix doc dir (#238070), patch by Alain PORTAL (aportal at univ-montp2.fr)
+
+* Tue Apr 22 2008 Roman Rakus <rrakus at redhat.cz> - 0:1.0.4-8
+- Use manual buffer size by default (#220481)
+
 * Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.4-7
 - f9+: Obsoletes: k3b-devel (#429613)
 


Index: k3brc
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/k3brc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3brc	9 Sep 2004 06:37:24 -0000	1.1
+++ k3brc	25 Jun 2008 18:45:24 -0000	1.2
@@ -1,5 +1,6 @@
 [General Options]
 check system config=false
+Manual buffer size=true
 
 [Notification Messages]
 Don't prompt me again.=No


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	5 Nov 2007 17:52:03 -0000	1.20
+++ sources	25 Jun 2008 18:45:24 -0000	1.21
@@ -1,2 +1,2 @@
-27833d12b8e9438eb7a10c5ab330fee1  k3b-i18n-1.0.4.tar.bz2
-42538ddae0809707d3bcdbe0a6ed6a43  k3b-1.0.4.tar.bz2
+e3b37d0d009af3dd149215d6ae0d54f3  k3b-1.0.5.tar.bz2
+610b1fd9356c89cbb38b6dda1f115c86  k3b-i18n-1.0.5.tar.bz2