rpms/k3b-extras-freeworld/F-11 k3b-extras-freeworld.spec,1.9,1.10
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19861
Modified Files:
k3b-extras-freeworld.spec
Log Message:
mark upstream(able) patches
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-11/k3b-extras-freeworld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- k3b-extras-freeworld.spec 29 Mar 2009 13:17:01 -0000 1.9
+++ k3b-extras-freeworld.spec 16 Jun 2009 17:40:46 -0000 1.10
@@ -17,8 +17,11 @@
Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-Patch1: k3b-1.0.5-ffmpeg.patch
-Patch2: k3b-lavc52.patch
+## upstreamable
+Patch50: k3b-1.0.5-ffmpeg.patch
+
+## upstream
+Patch100: k3b-lavc52.patch
ExcludeArch: s390 s390x
@@ -50,8 +53,8 @@
%setup -q -n k3b-%{version}
%if 0%{?ffmpeg:1}
-%patch1 -p1 -b .ffmpeg
-%patch2 -p1 -b .lavc52
+%patch50 -p1 -b .ffmpeg
+%patch100 -p1 -b .lavc52
make -f admin/Makefile.common
%endif
@@ -77,7 +80,7 @@
--with-lame \
--with-libmad
-%define makeflags %{?_smp_mflags}%{nil}
+%global makeflags %{?_smp_mflags}%{nil}
# We need just a few k3b core libs.
# As FC k3b package no longer includes the libtool archives,