rpms/xine-lib
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with F-8

Browse Source
This commit is contained in:
Ville Skyttä 2008-01-26 23:27:32 +00:00
parent 55201a3d7b
commit 05855294e3
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
xine-lib-1.1.9.1-pruned.tar.bz2 xine-lib-1.1.10-pruned.tar.bz2
xine-lib-1.1.9.1-autotools.patch.bz2 xine-lib-1.1.10-autotools.patch.bz2

4
sources
View File

@ -1,2 +1,2 @@
012fbd83dec565a06697426620baf21e xine-lib-1.1.9.1-pruned.tar.bz2 38b23253ba2fff335bb41cf8d7e87afe xine-lib-1.1.10-pruned.tar.bz2
fae182d050b231fff79eddf335b9a618 xine-lib-1.1.9.1-autotools.patch.bz2 823ca0360094a627857a303e069f5439 xine-lib-1.1.10-autotools.patch.bz2

14
xine-lib.spec
View File

@ -32,8 +32,8 @@
Summary: Xine library Summary: Xine library
Name: xine-lib Name: xine-lib
Version: 1.1.9.1 Version: 1.1.10
Release: 3%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://xinehq.de/ URL: http://xinehq.de/
@ -46,9 +46,7 @@ Source2: %{name}-mk-autotools-patch.sh
# autotools patch created with source2 # autotools patch created with source2
Patch0: %{name}-%{version}-autotools.patch.bz2 Patch0: %{name}-%{version}-autotools.patch.bz2
Patch1: %{name}-1.1.4-optflags.patch Patch1: %{name}-1.1.4-optflags.patch
Patch2: %{name}-1.1.9.1-aoclose-429182.patch
Patch6: %{name}-1.1.1-deepbind-939.patch Patch6: %{name}-1.1.1-deepbind-939.patch
Patch7: %{name}-1.1.5-multilib-devel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# X11 # X11
BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel
@ -162,17 +160,12 @@ touch -r configure.ac aclocal.m4
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch1 -p1 -b .optflags %patch1 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
%patch2 -p1 -b .aoclose
# Patch6 needed at least when compiling with external ffmpeg, #939. # Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind %patch6 -p1 -b .deepbind
%patch7 -p0 -b .multilib-devel
# Avoid standard rpaths on lib64 archs: # Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
# Quick and dirty fix for #429487, check if still needed in > 1.1.9.1:
sed -i -e 's/^\(Version:\s*\).*/\1%{version}/i' misc/libxine.pc.in
%build %build
export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
@ -391,6 +384,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
- 1.1.10 (security update).
* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3 * Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
- Fix version number in libxine.pc (#429487). - Fix version number in libxine.pc (#429487).