From 6fcbfb067f06cdf657739dea7d94e7f5576daedf Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Mon, 10 Jan 2011 19:17:08 +0000
Subject: [PATCH] * Mon Jan 10 2011 Dominik Mierzejewski <rpm at
 greysector.net> - 1.3.0-0.1.rc1 - 1.3.0-rc1 - drop upstreamed noexec stack
 patch

---
 .gitignore    |  2 +-
 sources       |  2 +-
 xvidcore.spec | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index eaf9d9e..4dbb2c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xvidcore-1.2.2.tar.bz2
+xvidcore-1.3.0-rc1.tar.bz2
diff --git a/sources b/sources
index 5f787b4..518e0b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a3473a12c8a1fa7bdc2b5cb829fab58  xvidcore-1.2.2.tar.bz2
+ab447a893e6dbfa556a7eb7043979d96  xvidcore-1.3.0-rc1.tar.bz2
diff --git a/xvidcore.spec b/xvidcore.spec
index faea9e1..5d7ac0a 100644
--- a/xvidcore.spec
+++ b/xvidcore.spec
@@ -1,13 +1,14 @@
+%global pre -rc1
+
 Name:           xvidcore
-Version:        1.2.2
-Release:        1%{?dist}
+Version:        1.3.0
+Release:        0.1.rc1%{?dist}
 Summary:        MPEG-4 Simple and Advanced Simple Profile codec
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.xvid.org/
-Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0:         xvidcore-noexec-stack.patch
+Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}%{pre}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch %{ix86} x86_64
@@ -35,7 +36,6 @@ documentation for the Xvid video codec.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -z .noexec-stack
 chmod -x examples/*.pl
 f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
 # Yes, we want to see the build output.
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.3.0-0.1.rc1
+- 1.3.0-rc1
+- drop upstreamed noexec stack patch
+
 * Sat Dec 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.2.2-1
 - 1.2.2
 - rebase noexec-stack patch