rpms/k3b/devel .cvsignore, 1.7, 1.8 k3b-0.11.14-rdrw.patch, 1.1, 1.2 k3b-0.11.14-suid.patch, 1.2, 1.3 k3b-0.11.3-kde32.patch, 1.1, 1.2 k3b.spec, 1.14, 1.15 sources, 1.7, 1.8

[fedora-cvs-commits redhat com]

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4231

Modified Files:
	.cvsignore k3b-0.11.14-rdrw.patch k3b-0.11.14-suid.patch 
	k3b-0.11.3-kde32.patch k3b.spec sources 
Log Message:
version 0.12-2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2005 11:16:11 -0000	1.7
+++ .cvsignore	12 Jul 2005 16:10:40 -0000	1.8
@@ -1,2 +1,2 @@
-k3b-i18n-0.11.tar.bz2
-k3b-0.11.23.tar.bz2
+k3b-0.12.2.tar.bz2
+k3b-i18n-0.12.2.tar.bz2

k3b-0.11.14-rdrw.patch:
 k3bdevice.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: k3b-0.11.14-rdrw.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.11.14-rdrw.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-0.11.14-rdrw.patch	9 Sep 2004 06:38:14 -0000	1.1
+++ k3b-0.11.14-rdrw.patch	12 Jul 2005 16:10:40 -0000	1.2
@@ -1,5 +1,5 @@
---- k3b-0.11.14/src/device/k3bdevice.cpp.rdrw	2004-09-01 11:38:38.650198640 +0200
-+++ k3b-0.11.14/src/device/k3bdevice.cpp	2004-09-01 11:39:06.021037640 +0200
+--- k3b-0.11.14/libk3bdevice/k3bdevice.cpp.rdrw	2004-09-01 11:38:38.650198640 +0200
++++ k3b-0.11.14/libk3bdevice/k3bdevice.cpp	2004-09-01 11:39:06.021037640 +0200
 @@ -80,12 +80,12 @@
    int fd = -1;
  #ifdef HAVE_RESMGR

k3b-0.11.14-suid.patch:
 k3bdefaultexternalprograms.cpp |   80 +++++------------------------------------
 1 files changed, 11 insertions(+), 69 deletions(-)

Index: k3b-0.11.14-suid.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.11.14-suid.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-0.11.14-suid.patch	30 Mar 2005 11:11:05 -0000	1.2
+++ k3b-0.11.14-suid.patch	12 Jul 2005 16:10:40 -0000	1.3
@@ -1,5 +1,5 @@
---- k3b-0.11.20/src/core/k3bdefaultexternalprograms.cpp.suid	2005-03-02 14:04:00.000000000 +0100
-+++ k3b-0.11.20/src/core/k3bdefaultexternalprograms.cpp	2005-03-02 14:05:11.000000000 +0100
+--- k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp.suid	2005-03-02 14:04:00.000000000 +0100
++++ k3b-0.11.20/libk3b/core/k3bdefaultexternalprograms.cpp	2005-03-02 14:05:11.000000000 +0100
 @@ -188,7 +188,7 @@
      if( out.output().contains( "-xamix" ) ||
  	bin->version >= K3bVersion( 2, 1, -1, "a12" ) )

k3b-0.11.3-kde32.patch:
 k3bsetup2.desktop |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: k3b-0.11.3-kde32.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.11.3-kde32.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-0.11.3-kde32.patch	9 Sep 2004 06:37:24 -0000	1.1
+++ k3b-0.11.3-kde32.patch	12 Jul 2005 16:10:40 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur k3b-0.11.3-orig/src/k3bsetup/k3bsetup2.desktop k3b-0.11.3/src/k3bsetup/k3bsetup2.desktop
---- k3b-0.11.3-orig/src/k3bsetup/k3bsetup2.desktop	2004-01-23 17:01:52.000000000 +0100
-+++ k3b-0.11.3/src/k3bsetup/k3bsetup2.desktop	2004-02-14 05:23:57.000000000 +0100
+diff -Nur k3b-0.11.3-orig/k3bsetup/k3bsetup2.desktop k3b-0.11.3/src/k3bsetup/k3bsetup2.desktop
+--- k3b-0.11.3-orig/k3bsetup/k3bsetup2.desktop	2004-01-23 17:01:52.000000000 +0100
++++ k3b-0.11.3/k3bsetup/k3bsetup2.desktop	2004-02-14 05:23:57.000000000 +0100
 @@ -45,4 +45,4 @@
  X-KDE-Library=k3bsetup2
  X-KDE-ModuleType=Library


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- k3b.spec	7 Apr 2005 14:53:51 -0000	1.14
+++ k3b.spec	12 Jul 2005 16:10:40 -0000	1.15
@@ -1,8 +1,8 @@
 %define i18n_version 0.11
 
 Name: k3b
-Version: 0.11.23
-Release: 3
+Version: 0.12.2
+Release: 1
 Epoch: 0
 Summary: CD/DVD burning application for KDE
 
@@ -19,6 +19,7 @@
 Patch6: k3b-0.11.14-suid.patch
 Patch7: k3b-0.11.17-dao.patch
 Patch8: k3b-0.11.23-statfs.patch
+Patch9: k3b-0.11.23-proxy.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 ExcludeArch: s390 s390x
@@ -32,7 +33,7 @@
 BuildRequires: libmng-devel fam-devel glib2-devel alsa-lib-devel esound-devel
 BuildRequires: libidn-devel
 
-Requires: cdrecord, mkisofs
+Requires: cdrecord mkisofs dvd+rw-tools cdrdao
 Provides: %{name}-devel = %{epoch}:%{version}-%{release}
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
 
@@ -47,13 +48,14 @@
 
 %prep
 %setup -q -a 1
-%patch1 -p1 -b .forkde32
+#%patch1 -p1 -b .forkde32
 %patch2 -p1 -b .desktop-file-utils-0.3
 %patch3 -p1 -b .scsi-devices
 %patch5 -p1 -b .version
 %patch6 -p1 -b .suid
 %patch7 -p1 -b .dao
 %patch8 -p1 -b .statfs
+%patch9 -p1 -b .httpfix
 
 # Make desktop icon file names compatible with GNOME.
 sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop src/k3bsetup/k3bsetup2.desktop
@@ -149,6 +151,9 @@
 %lang(sv) %doc %{_docdir}/HTML/sv/*
 
 %changelog
+* Wed Jul 11 2005 Harald Hoyer <harald redhat com> 0:0.11.23-2
+- added "dvd+rw-tools cdrdao" to Requires
+
 * Thu Apr  7 2005 Petr Rockai <prockai redhat com> - 0:0.11.23-3
 - fix statfs usage (as per issue 65935 from IT)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2005 11:16:11 -0000	1.7
+++ sources	12 Jul 2005 16:10:40 -0000	1.8
@@ -1,2 +1,2 @@
-80d1ac1766ad8a8cdadca5f4273f2d95  k3b-i18n-0.11.tar.bz2
-eaff485fb4c431aae715b0ef95c43fcf  k3b-0.11.23.tar.bz2
+52dac62c8f22330784f82703385482ee  k3b-0.12.2.tar.bz2
+bea95a7fe1364231aba822f8aab7e4d9  k3b-i18n-0.12.2.tar.bz2