[k3b] remove workaround for previously missing hicolor icon, fixed properly now.
Rex Dieter
rdieter at fedoraproject.org
Tue Aug 31 16:57:58 UTC 2010
commit 8d6c8a56fd2742be85deab383b082bfd9d710ffc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Aug 31 12:02:51 2010 -0500
remove workaround for previously missing hicolor icon, fixed
properly now.
.gitignore | 1 -
k3b.spec | 8 --------
sources | 1 -
3 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc52442..a57b46f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/ox32-k3b.png
/k3b-2.0.1.tar.bz2
diff --git a/k3b.spec b/k3b.spec
index 777aebf..fa1be71 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -16,8 +16,6 @@ URL: http://www.k3b.org/
Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# k3b app icon missing, https://bugzilla.redhat.com/show_bug.cgi?id=611272
-Source1: ox32-k3b.png
# Patch for crashing on open settings, remove this temporary workaround when fixed (#582764)
# Upstream bug: https://bugs.kde.org/show_bug.cgi?id=238819
Patch0: k3b-2.0_settings-crash.patch
@@ -112,12 +110,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
cat kio_videodvd.lang >> k3b.lang
cat libk3bdevice.lang >> libk3b.lang
-# k3b app icon missing, https://bugzilla.redhat.com/show_bug.cgi?id=611272
-if [ ! -f %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png ]; then
- echo "NOTICE: %{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png missing, borrowing oxygen version"
- install -pD -m644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png
-fi
-
## unpackaged files
# k3bsetup crud
rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/k3bsetup.mo
diff --git a/sources b/sources
index 8eb0b5b..d10dcb2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f7118c8cf20d0a49fcc06e685429ece6 ox32-k3b.png
4e5b6665d91d4984cbfa814b797257cb k3b-2.0.1.tar.bz2
More information about the scm-commits
mailing list