[svn] r5454 - trunk/rpms/mpeg2dec

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Thu May 31 13:01:14 CEST 2007


Author: thias
Date: 2007-05-31 13:01:08 +0200 (Thu, 31 May 2007)
New Revision: 5454

Added:
   trunk/rpms/mpeg2dec/mpeg2dec-0.4.1-automake-1.10.patch
Modified:
   trunk/rpms/mpeg2dec/mpeg2dec.spec
Log:
Fix mpeg2dec to build with F7's automake 1.10.


Added: trunk/rpms/mpeg2dec/mpeg2dec-0.4.1-automake-1.10.patch
===================================================================
--- trunk/rpms/mpeg2dec/mpeg2dec-0.4.1-automake-1.10.patch	                        (rev 0)
+++ trunk/rpms/mpeg2dec/mpeg2dec-0.4.1-automake-1.10.patch	2007-05-31 11:01:08 UTC (rev 5454)
@@ -0,0 +1,12 @@
+diff -Naupr mpeg2dec-0.4.1.orig/bootstrap mpeg2dec-0.4.1/bootstrap
+--- mpeg2dec-0.4.1.orig/bootstrap	2006-02-14 11:00:54.000000000 +0100
++++ mpeg2dec-0.4.1/bootstrap	2007-05-31 00:08:02.000000000 +0200
+@@ -4,7 +4,7 @@ set -e
+ 
+ # Check for automake
+ amvers="no"
+-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
++for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
+   if automake${v} --version >/dev/null 2>&1; then
+     amvers="${v}"
+     break

Modified: trunk/rpms/mpeg2dec/mpeg2dec.spec
===================================================================
--- trunk/rpms/mpeg2dec/mpeg2dec.spec	2007-05-31 10:59:47 UTC (rev 5453)
+++ trunk/rpms/mpeg2dec/mpeg2dec.spec	2007-05-31 11:01:08 UTC (rev 5454)
@@ -7,6 +7,7 @@
 
 %{!?dist:%define _with_modxorg 1}
 %{?el5:%define _with_modxorg 1}
+%{?fc7:%define _with_modxorg 1}
 %{?fc6:%define _with_modxorg 1}
 %{?fc5:%define _with_modxorg 1}
 
@@ -15,12 +16,13 @@
 Summary: MPEG-2 and MPEG-1 decoding library and test program
 Name: mpeg2dec
 Version: 0.4.1
-Release: 1%{?date:.%{date}}
+Release: 2%{?date:.%{date}}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://libmpeg2.sourceforge.net/
 Source: http://libmpeg2.sourceforge.net/files/mpeg2dec-%{?date:snapshot}%{!?date:%{version}}.tar.gz
-Patch: mpeg2dec-0.4.0b-pic.patch
+Patch0: mpeg2dec-0.4.0b-pic.patch
+Patch1: mpeg2dec-0.4.1-automake-1.10.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, pkgconfig, gcc-c++
 %{?_with_modxorg:BuildRequires: libXt-devel, libXv-devel}
@@ -46,7 +48,8 @@
 
 %prep
 %setup -n %{name}-%{version}%{?date:-cvs}
-%patch -p0 -b .pic
+%patch0 -p0 -b .pic
+%patch1 -p1 -b .automake-1.10
 ./bootstrap
 
 
@@ -93,6 +96,9 @@
 
 
 %changelog
+* Thu May 31 2007 Matthias Saou <http://freshrpms.net/> 0.4.1-2
+- Include patch for bootstrap to work with automake 1.10 (F7).
+
 * Wed Mar  7 2007 Matthias Saou <http://freshrpms.net/> 0.4.1-1
 - Update to 0.4.1.
 
@@ -156,7 +162,7 @@
 
 * Wed May 08 2002 Erik Walthinsen <omega at temple-baptist.com>
 - changed whitespace
-- removed %attr and changed %defattr to (-,root,root)
+- removed %%attr and changed %%defattr to (-,root,root)
 
 * Fri May 03 2002 Thomas Vander Stichele <thomas at apestaart.org>
 - adapted from PLD spec for 0.2.1




More information about the commits mailing list