diff -r 4f133201e207 -r 4667f24fe848 x264/x264.spec
--- a/x264/x264.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/x264/x264.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,42 +1,29 @@
-%global snapshot 20100706
-%global git d058f37
-
-Summary: H264/AVC video streams encoder
-Name: x264
-Version: 0.0.0
-Release: 0.28.%{snapshot}git%{git}%{?dist}
-License: GPLv2+
-Group: System Environment/Libraries
-URL: http://developers.videolan.org/x264.html
-Source0: %{name}-%{snapshot}.tar.bz2
-Source1: x264-snapshot.sh
-# don't remove config.h and don't re-run version.sh
-Patch0: x264-nover.patch
-# link with shared libx264
-Patch1: x264-shared.patch
-# don't strip if configured with --enable-debug
-Patch2: x264-nostrip.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-%{!?_without_gpac:BuildRequires: gpac-devel-static}
-%{?_with_visualize:BuildRequires: libX11-devel}
-%ifarch x86_64 i686
+Name:     x264
+Summary:  H264/AVC video streams encoder
+Vendor:     Europalab Software
+Packager:   Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Version:  20101210
+Release:  20101210
+License:  GPLv2+
+Group:    System Environment/Libraries
+URL:      http://developers.videolan.org/x264.html
+Source0:  %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: %{name}-libs = %{version}-%{release}
 BuildRequires: yasm
-%endif
-Requires: %{name}-libs = %{version}-%{release}
 
 %description
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
-This package contains the frontend.
+x264 is a free library for encoding H264/AVC video streams.
+This package contains the frontend application.
 
 %package libs
 Summary: Library for encoding H264/AVC video streams
 Group: Development/Libraries
 
 %description libs
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
+x264 is a free library for encoding H264/AVC video streams.
+This package contains runtime libraries.
 
 %package devel
 Summary: Development files for the x264 library
@@ -45,54 +32,34 @@
 Requires: pkgconfig
 
 %description devel
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
+x264 is a free library for encoding H264/AVC video streams.
 This package contains the development files.
 
-%define x_configure \
-./configure \\\
-	--prefix=%{_prefix} \\\
-	--exec-prefix=%{_exec_prefix} \\\
-	--bindir=%{_bindir} \\\
-	--includedir=%{_includedir} \\\
-	--extra-cflags="$RPM_OPT_FLAGS" \\\
-	%{!?_without_gpac:--enable-mp4-output} \\\
-	%{?_with_visualize:--enable-visualize} \\\
-	--enable-pthread \\\
-	--enable-debug \\\
-	--enable-shared \\\
-	--enable-pic
-
-
 %prep
-%setup -q -n %{name}-%{snapshot}
-%patch0 -p1 -b .nover
-%patch1 -p1 -b .shared
-%patch2 -p1 -b .nostrip
-# AUTHORS file is in iso-8859-1
-iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
-mv -f AUTHORS.utf8 AUTHORS
+%setup -q -n %{name}-%{version}
 %ifarch i686
 mkdir simd
 cp -a `ls -1|grep -v simd` simd/
 %endif
+%{__sed} -i \
+    -e 's;\(\./version.sh\);# Dont run this: \1;g' \
+    configure
 
 %build
-%{x_configure}\
-	--host=%{_target_platform} \
-	--libdir=%{_libdir} \
+%configure \
+    --enable-shared \
+    --host=%{_target_platform} \
 %ifarch i686
-	--disable-asm \
+    --disable-asm \
 %endif
-
+    --enable-visualize
+echo '#define X264_VERSION "r1820 fdcf2ae"' >>config.h
+echo '#define X264_POINTVER "0.110.1820 fdcf2ae"' >>config.h
 %{__make} %{?_smp_mflags}
 %ifarch i686
 pushd simd
-%{x_configure}\
-	--host=%{_target_platform} \
-	--libdir=%{_libdir}/sse2 \
-
+%configure \
+    --host=%{_target_platform}
 %{__make} %{?_smp_mflags}
 popd
 %endif
@@ -100,12 +67,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
-%ifarch i686
-pushd simd
-%{__make} DESTDIR=%{buildroot} install
-rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc
-popd
-%endif
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -132,6 +93,8 @@
 %defattr(644, root, root, 0755)
 %doc doc/*
 %{_includedir}/x264.h
+%{_includedir}/x264_config.h
+%{_libdir}/libx264.a
 %{_libdir}/libx264.so
 %{_libdir}/pkgconfig/%{name}.pc
 %ifarch i686
@@ -139,5 +102,8 @@
 %endif
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 4.1.3-20101201
+- Adjust packaging and patch logic
+
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> 0.0.0-0.28.20100706gitd058f37
-- Build for MeeGo
+- Build for MeeGo 1.1