diff -r 4f133201e207 -r 4667f24fe848 libmpeg2/libmpeg2.spec
--- a/libmpeg2/libmpeg2.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/libmpeg2/libmpeg2.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,97 +1,90 @@
 Name:           libmpeg2
+Summary:        MPEG-2 decoder libraries
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Version:        0.5.1
-Release:        9%{?dist}
-Summary:        MPEG-2 decoder libraries
-
+Release:        20101201
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://libmpeg2.sourceforge.net/
 Source0:        http://libmpeg2.sourceforge.net/files/libmpeg2-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  SDL-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXv-devel
-
+BuildRequires:  chrpath
 
 %description
-libmpeg2 is a free library for decoding mpeg-2 and mpeg-1 video
-streams. It is released under the terms of the GPL license.
+The libmpeg2 library is a free decoder of mpeg-2 and mpeg-1 video streams.
 
-%package -n     mpeg2dec
+%package -n mpeg2dec
 Summary:        MPEG-2 decoder program
 Group:          Applications/Multimedia
 Requires:       %{name} = %{version}-%{release}
 
 %description -n mpeg2dec
-The %{name}-devel package contains libraries and header files for
+The libmpeg2 library is a free decoder of mpeg-2 and mpeg-1 video
+streams. This package contains the small mpeg2dec(1) test program
+used together with %{name}.
+
+%package devel
+Summary:        Development files for %{name}
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Group:          Development/Libraries
+Requires:       pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-devel = %{version}-%{release}
+
+%description devel
+The libmpeg2 library is a free decoder of mpeg-2 and mpeg-1 video
+streams. This package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-# Introducted in F-10 Can be dropped in F-12
-Provides:       mpeg2dec-devel = %{version}-%{release}
-Obsoletes:      mpeg2dec-devel < %{version}
-
-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-
 %prep
 %setup -q
-iconv -f ISO-8859-1 -t UTF-8 AUTHORS > AUTHORS.tmp
-touch -r AUTHORS AUTHORS.tmp 
-cp -p -f AUTHORS.tmp AUTHORS
-rm AUTHORS.tmp
 
-#Disable ppc altivec case
-sed -i -e 's/ppc-/noppc64-/' configure.ac configure
-sed -i -e 's/powerpc-/nopowerpc64-/' configure.ac configure
+# disable ppc altivec case
+sed -i -e 's;ppc-;noppc64-;' configure.ac configure
+sed -i -e 's;powerpc-;nopowerpc64-;' configure.ac configure
 
 %build
-%configure --disable-static \
+%configure \
+    --enable-shared \
 %ifarch %{ix86} ppc
-  --disable-accel-detect \
+    --disable-accel-detect \
 %endif
-
-# mpeg2dec have rpath
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+    --disable-rpath
 
 make %{?_smp_mflags} \
 %ifarch %{ix86}
-  OPT_CFLAGS="-fPIC -DPIC" \
+    OPT_CFLAGS="-fPIC -DPIC" \
 %else
-  OPT_CFLAGS="" \
+    OPT_CFLAGS=""
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# fix datatype internal definitions
+install -pm 0644 libmpeg2/mpeg2_internal.h \
+    $RPM_BUILD_ROOT%{_includedir}/mpeg2dec/
 
-#Fix datatype internal definitions
-install -pm 0644 libmpeg2/mpeg2_internal.h \
-  $RPM_BUILD_ROOT%{_includedir}/mpeg2dec/
-
-
+# remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
@@ -102,18 +95,21 @@
 %{_bindir}/corrupt_mpeg2
 %{_bindir}/extract_mpeg2
 %{_bindir}/mpeg2dec
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/extract_mpeg2.1.gz
+%{_mandir}/man1/mpeg2dec.1.gz
 
 %files devel
 %defattr(-,root,root,-)
 %doc CodingStyle doc/libmpeg2.txt doc/sample*.c
-%{_includedir}/mpeg2dec/
+%{_includedir}/mpeg2dec
+%{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/libmpeg2.pc
-%{_libdir}/pkgconfig/libmpeg2convert.pc
-
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.5.1-20101201
+- Adjust packaging and patch logic
+
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.5.1-9
 - Build for MeeGo 1.1