diff -r 4f133201e207 -r 4667f24fe848 xvidcore/xvidcore.spec
--- a/xvidcore/xvidcore.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/xvidcore/xvidcore.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,15 +1,15 @@
 Name:           xvidcore
-Version:        1.2.1
-Release:        1%{?dist}
 Summary:        MPEG-4 Simple and Advanced Simple Profile codec
-
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Version:        1.2.2
+Release:        20101201
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.xvid.org/
 Source0:        http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0:         xvidcore-1.2.1-noexec-stack.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 %ifarch %{ix86} x86_64
 BuildRequires:  nasm >= 2.0
 %endif
@@ -20,68 +20,73 @@
 in order to reduce the required bandwidth of video data for transmission
 over computer networks or efficient storage on CDs or DVDs. Due to its
 unrivalled quality Xvid has gained great popularity and is used in many
-other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine and
-many more.
+other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine
+and many more.
 
 %package        devel
 Summary:        Development files for the Xvid video codec
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-This package contains header files, static library and API
-documentation for the Xvid video codec.
+The Xvid video codec implements MPEG-4 Simple Profile and Advanced Simple
+Profile standards. It permits compressing and decompressing digital video
+in order to reduce the required bandwidth of video data for transmission
+over computer networks or efficient storage on CDs or DVDs. Due to its
+unrivalled quality Xvid has gained great popularity and is used in many
+other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine
+and many more.
 
+This package contains header files, static library and API 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.
-%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
-
+%setup -q -c -n %{name}-%{version}
+chmod -x %{name}/examples/*.pl
+%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' %{name}/build/generic/Makefile
 
 %build
-cd build/generic
+cd %{name}/build/generic
 export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
 %configure
-make %{?_smp_mflags} 
-cd -
-
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
-cd $RPM_BUILD_ROOT%{_libdir}
-chmod 755 libxvidcore.so*
-/sbin/ldconfig -n .
-ln -s libxvidcore.so.? libxvidcore.so
-cd -
-
+( cd %{name}
+  make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
+  cd $RPM_BUILD_ROOT%{_libdir}
+  chmod 755 libxvidcore.so*
+  /sbin/ldconfig -n .
+  ln -s libxvidcore.so.? libxvidcore.so
+) || exit $?
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README AUTHORS ChangeLog
+%doc %{name}/LICENSE %{name}/README %{name}/AUTHORS %{name}/ChangeLog
 %{_libdir}/libxvidcore.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc CodingStyle TODO examples/
+%doc %{name}/CodingStyle %{name}/TODO %{name}/examples
 %{_includedir}/xvid.h
+%{_libdir}/libxvidcore.a
 %{_libdir}/libxvidcore.so
 
+%changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 1.2.2-20101201
+- Synchronize with upstream vendor version 1.2.2
+- Adjust packaging and patch logic
 
-%changelog
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 1.2.1-1
-- Build for MeeGo 1.1
+- Package for MeeGo 1.1