1.1 --- a/xvidcore/xvidcore.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/xvidcore/xvidcore.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,15 +1,15 @@
1.4 Name: xvidcore
1.5 -Version: 1.2.1
1.6 -Release: 1%{?dist}
1.7 Summary: MPEG-4 Simple and Advanced Simple Profile codec
1.8 -
1.9 +Vendor: Europalab Software
1.10 +Packager: Michael Schloh von Bennewitz
1.11 +Distribution: MeeGo Thirdparty
1.12 +Version: 1.2.2
1.13 +Release: 20101201
1.14 Group: System Environment/Libraries
1.15 License: GPLv2+
1.16 URL: http://www.xvid.org/
1.17 Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
1.18 -Patch0: xvidcore-1.2.1-noexec-stack.patch
1.19 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
1.20 -
1.21 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.22 %ifarch %{ix86} x86_64
1.23 BuildRequires: nasm >= 2.0
1.24 %endif
1.25 @@ -20,68 +20,73 @@
1.26 in order to reduce the required bandwidth of video data for transmission
1.27 over computer networks or efficient storage on CDs or DVDs. Due to its
1.28 unrivalled quality Xvid has gained great popularity and is used in many
1.29 -other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine and
1.30 -many more.
1.31 +other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine
1.32 +and many more.
1.33
1.34 %package devel
1.35 Summary: Development files for the Xvid video codec
1.36 +Vendor: Europalab Software
1.37 +Packager: Michael Schloh von Bennewitz
1.38 +Distribution: MeeGo Thirdparty
1.39 Group: Development/Libraries
1.40 Requires: %{name} = %{version}-%{release}
1.41
1.42 %description devel
1.43 -This package contains header files, static library and API
1.44 -documentation for the Xvid video codec.
1.45 +The Xvid video codec implements MPEG-4 Simple Profile and Advanced Simple
1.46 +Profile standards. It permits compressing and decompressing digital video
1.47 +in order to reduce the required bandwidth of video data for transmission
1.48 +over computer networks or efficient storage on CDs or DVDs. Due to its
1.49 +unrivalled quality Xvid has gained great popularity and is used in many
1.50 +other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine
1.51 +and many more.
1.52
1.53 +This package contains header files, static library and API documentation
1.54 +for the Xvid video codec.
1.55
1.56 %prep
1.57 -%setup -q -n %{name}
1.58 -%patch0 -p1 -z .noexec-stack
1.59 -chmod -x examples/*.pl
1.60 -f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
1.61 -# Yes, we want to see the build output.
1.62 -%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
1.63 -
1.64 +%setup -q -c -n %{name}-%{version}
1.65 +chmod -x %{name}/examples/*.pl
1.66 +%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' %{name}/build/generic/Makefile
1.67
1.68 %build
1.69 -cd build/generic
1.70 +cd %{name}/build/generic
1.71 export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
1.72 %configure
1.73 -make %{?_smp_mflags}
1.74 -cd -
1.75 -
1.76 +make %{?_smp_mflags}
1.77
1.78 %install
1.79 rm -rf $RPM_BUILD_ROOT
1.80 -make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
1.81 -rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
1.82 -cd $RPM_BUILD_ROOT%{_libdir}
1.83 -chmod 755 libxvidcore.so*
1.84 -/sbin/ldconfig -n .
1.85 -ln -s libxvidcore.so.? libxvidcore.so
1.86 -cd -
1.87 -
1.88 +( cd %{name}
1.89 + make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
1.90 + cd $RPM_BUILD_ROOT%{_libdir}
1.91 + chmod 755 libxvidcore.so*
1.92 + /sbin/ldconfig -n .
1.93 + ln -s libxvidcore.so.? libxvidcore.so
1.94 +) || exit $?
1.95
1.96 %clean
1.97 rm -rf $RPM_BUILD_ROOT
1.98
1.99 -
1.100 %post -p /sbin/ldconfig
1.101
1.102 %postun -p /sbin/ldconfig
1.103
1.104 -
1.105 %files
1.106 %defattr(-,root,root,-)
1.107 -%doc LICENSE README AUTHORS ChangeLog
1.108 +%doc %{name}/LICENSE %{name}/README %{name}/AUTHORS %{name}/ChangeLog
1.109 %{_libdir}/libxvidcore.so.*
1.110
1.111 %files devel
1.112 %defattr(-,root,root,-)
1.113 -%doc CodingStyle TODO examples/
1.114 +%doc %{name}/CodingStyle %{name}/TODO %{name}/examples
1.115 %{_includedir}/xvid.h
1.116 +%{_libdir}/libxvidcore.a
1.117 %{_libdir}/libxvidcore.so
1.118
1.119 +%changelog
1.120 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 1.2.2-20101201
1.121 +- Synchronize with upstream vendor version 1.2.2
1.122 +- Adjust packaging and patch logic
1.123
1.124 -%changelog
1.125 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 1.2.1-1
1.126 -- Build for MeeGo 1.1
1.127 +- Package for MeeGo 1.1
