rpms/k3b/F-13 .cvsignore, 1.30, 1.31 k3b.spec, 1.94, 1.95 sources, 1.31, 1.32

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13155

Modified Files:
	.cvsignore k3b.spec sources 
Log Message:
use source'd icon



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore	6 Jul 2010 16:12:46 -0000	1.30
+++ .cvsignore	6 Jul 2010 16:26:14 -0000	1.31
@@ -1 +1,2 @@
 k3b-2.0.0.tar.bz2
+ox32-k3b.png


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/k3b.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- k3b.spec	6 Jul 2010 16:12:46 -0000	1.94
+++ k3b.spec	6 Jul 2010 16:26:14 -0000	1.95
@@ -16,6 +16,9 @@ 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
+
 # ie, where cdrecord and friends aren't present
 ExcludeArch: s390 s390x
 
@@ -35,7 +38,6 @@ BuildRequires: libvorbis-devel
 BuildRequires: taglib-devel
 
 Requires: kdebase-runtime%{?_kde_version: >= %{_kde4_version}}
-
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 %if 0%{?common}
 Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -109,8 +111,7 @@ 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 %{_kde4_iconsdir}/oxygen/32x32/apps/k3b.png \
-        %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png
+  install -pD -m644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png
 fi
 
 ## unpackaged files


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	6 Jul 2010 16:12:47 -0000	1.31
+++ sources	6 Jul 2010 16:26:14 -0000	1.32
@@ -1 +1,2 @@
 2ec161ccd6c24778d4c5289c85473747  k3b-2.0.0.tar.bz2
+f7118c8cf20d0a49fcc06e685429ece6  ox32-k3b.png