[kmplayer] kmplayer-0.11.3c

[Orcan Ogetbil]

commit 31b9121ba1ee779a3b53817c86bf5248d8a49206
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed Mar 7 23:45:30 2012 -0500

    kmplayer-0.11.3c
    
    - Drop all upstreamed patches

 .gitignore                      |    1 +
 kmplayer-buildfix-glib.patch    |   39 ---------------------------------
 kmplayer-desktop_validate.patch |   45 ---------------------------------------
 kmplayer-fix-perms.patch        |   12 ----------
 kmplayer-gcc47.patch            |   12 ----------
 kmplayer-include-doc-po.patch   |   15 -------------
 kmplayer.spec                   |   32 +++++++--------------------
 sources                         |    2 +-
 8 files changed, 11 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5441466..ef7267d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ kmplayer-0.11.2b.tar.bz2
 /kmplayer-0.11.2c.tar.bz2
 /kmplayer-0.11.3a.tar.bz2
 /kmplayer-0.11.3b.tar.bz2
+/kmplayer-0.11.3c.tar.bz2
diff --git a/kmplayer.spec b/kmplayer.spec
index 2814f51..6eeb04b 100644
--- a/kmplayer.spec
+++ b/kmplayer.spec
@@ -1,7 +1,7 @@
 Name:    kmplayer
 Summary: A simple front-end for MPlayer/FFMpeg/Phonon
-Version: 0.11.3b
-Release: 2%{?dist}
+Version: 0.11.3c
+Release: 1%{?dist}
 Group:   Applications/Multimedia
 # The documentation is GFDL.
 # The files under src/moz-sdk are MPLv1.1 or GPLv2+ or LGPLv2+
@@ -19,22 +19,12 @@ Source0: http://kmplayer.kde.org/pkgs/kmplayer-%{version}%{?beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
-# reinclude docs and translations
-Patch0: kmplayer-include-doc-po.patch
-# fix desktop file permission
-Patch1: kmplayer-fix-perms.patch
-# build fix against more recent glib2
-Patch2: kmplayer-buildfix-glib.patch
-# Build fix against gcc-4.7
-Patch3: kmplayer-gcc47.patch
 # default to using phonon (instead of mplayer)
 # Put this into kde-settings instead? -- Rex
-Patch4: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
+Patch0: kmplayer-0.11.0a-kmplayerrc_phonon_default.patch
 
 ## upstream patches
-# http://websvn.kde.org/?view=revision&revision=1225583
-# except the test lines are re-introduced
-Patch100: kmplayer-desktop_validate.patch
+
 
 BuildRequires: cairo-devel
 BuildRequires: dbus-devel 
@@ -56,17 +46,10 @@ on a movie file, the movie is played inside Konqueror.
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
-
-%patch0 -p1 -b .docpo
-%patch1 -p1 -b .perms
-%patch2 -p1 -b .glib2
-%patch3 -p1 -b .gcc47
-%patch4 -p1 -b .kmplayerrc_phonon_default
-%patch100 -p1 -b .desktop_validate
+%patch0 -p1 -b .kmplayerrc_phonon_default
 
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
@@ -78,7 +61,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 ## File lists
@@ -120,6 +102,10 @@ update-desktop-database -q &> /dev/null || :
 
 
 %changelog
+* Wed Mar 07 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.3c-1
+- kmplayer-0.11.3c
+- Drop all upstreamed patches
+
 * Wed Feb 15 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.3b-2
 - gcc-4.7 build fix
 
diff --git a/sources b/sources
index 4ce6af7..6f57480 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbfbb37bb47cf006be68bcbbaaa5475a  kmplayer-0.11.3b.tar.bz2
+3e9ef221ca15d264e553706c6e611eb9  kmplayer-0.11.3c.tar.bz2