[k3b] use /var/tmp instead of /tmp

Rex Dieter rdieter at fedoraproject.org
Wed Dec 19 13:50:24 UTC 2012


commit 3c2e4936d3eb83575cd26175dc8cd9de771ce226
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Dec 19 07:50:47 2012 -0600

    use /var/tmp instead of /tmp

 k3b-2.0.2-use_vartmp_instead_of_tmp.patch |   24 ++++++++++++++++++++++++
 k3b.spec                                  |   17 +++++++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/k3b-2.0.2-use_vartmp_instead_of_tmp.patch b/k3b-2.0.2-use_vartmp_instead_of_tmp.patch
new file mode 100644
index 0000000..3d12677
--- /dev/null
+++ b/k3b-2.0.2-use_vartmp_instead_of_tmp.patch
@@ -0,0 +1,24 @@
+diff -up k3b-2.0.2/src/projects/kostore/KoZipStore.cpp.tmp k3b-2.0.2/src/projects/kostore/KoZipStore.cpp
+--- k3b-2.0.2/src/projects/kostore/KoZipStore.cpp.tmp	2011-01-15 14:47:30.000000000 -0600
++++ k3b-2.0.2/src/projects/kostore/KoZipStore.cpp	2012-12-19 07:45:18.683747055 -0600
+@@ -65,7 +65,7 @@ KoZipStore::KoZipStore( QWidget* window,
+     else
+     {
+         m_fileMode = KoStoreBase::RemoteWrite;
+-        m_localFileName = "/tmp/kozip"; // ### FIXME with KTempFile
++        m_localFileName = "/var/tmp/kozip"; // ### FIXME with KTempFile or $KDEVARTMP
+     }
+ 
+     m_pZip = new KZip( m_localFileName );
+diff -up k3b-2.0.2/src/rip/k3bvideocdrippingoptions.h.tmp k3b-2.0.2/src/rip/k3bvideocdrippingoptions.h
+--- k3b-2.0.2/src/rip/k3bvideocdrippingoptions.h.tmp	2011-01-15 14:47:30.000000000 -0600
++++ k3b-2.0.2/src/rip/k3bvideocdrippingoptions.h	2012-12-19 07:43:27.355101301 -0600
+@@ -25,7 +25,7 @@ class VideoCdRippingOptions
+         VideoCdRippingOptions()
+             :   m_videocdsize( 0 ),
+                 m_videocdsource( "/dev/cdrom" ),
+-                m_videocddestination( "/tmp" ),
++                m_videocddestination( "/var/tmp" ),
+                 m_videocddescription( i18n( "Video CD" ) ),
+                 m_videocdripfiles( false ),
+                 m_videocdripsegments( false ),
diff --git a/k3b.spec b/k3b.spec
index 1a1e6b1..0e70119 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -3,7 +3,7 @@ Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 2.0.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -14,6 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
+# Remove WebKit on RHEL
+Patch1: k3b-2.0.2-no-webkit.patch
+
+## upstreamable patches
+Patch50: k3b-2.0.2-use_vartmp_instead_of_tmp.patch
+
 ## upstream patches
 # wodim(cdrecord) doesnt work for DVDs/BluRay, use growisofs instead
 # http://bugzilla.redhat.com/610976
@@ -29,8 +35,6 @@ Patch101: k3b-2.0.2-overburn-cdr90.patch
 # (followup to the above fix)
 # https://projects.kde.org/projects/extragear/multimedia/k3b/repository/revisions/8270d2853f2962facdf6f9ea6d669922d6c78aba
 Patch102: k3b-2.0.2-overburn-usedcapacity.patch
-# Remove WebKit on RHEL
-Patch103: k3b-2.0.2-no-webkit.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -97,12 +101,14 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch50 -p1 -b .use_vartmp_instead_of_tmp
+
 %patch100 -p1 -b .use_growisofs_instead_of_wodim
 %patch101 -p1 -b .overburn-cdr90
 %patch102 -p1 -b .overburn-usedcapacity
 
 %if 0%{?rhel} > 6
-%patch103 -p1 -b .no-webkit
+%patch1 -p1 -b .no-webkit
 %endif
 
 
@@ -200,6 +206,9 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
 
 %changelog
+* Wed Dec 19 2012 Rex Dieter <rdieter at fedoraproject.org> 1:2.0.2-15
+- use /var/tmp instead of /tmp
+
 * Thu Nov 29 2012 Radek Novacek <rnovacek at redhat.com> 1:2.0.2-14
 - Use -fno-strict-aliasing (k3b does some nasty stuff with pointers in iso9660 support)
 


More information about the scm-commits mailing list