@@ -7,19 +7,20 @@

 Summary(de):   Der VideoLAN Client, auch sehr gut als Standalone Player verwendbar.

 URL:       http://www.videolan.org/

 Version:   0.8.6d

-Release:   1

+Release:   1.3

 Source0:   http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}.tar.bz2

 Patch0:        fix_font_path.patch

 Patch1:        vlc_ffmpeg_new.diff

-BuildRoot: %{_tmppath}/%{name}-%{version}-build

-

-# SUSE BR's

-BuildRequires: xorg-x11-devel xorg-x11-libs wxGTK-devel libcdio-devel libcddb-devel libdvdread-devel libdvdnav-devel libogg-devel flac-devel libvorbis-devel SDL-devel aalib-devel esound-devel arts-devel alsa-devel lirc ncurses-devel xosd-devel id3lib-devel aalib fribidi-devel libcaca-devel libdts-devel hal hal-devel libgcrypt SDL_image-devel libgcrypt-devel libid3tag-devel libtheora-devel libsmbclient-devel gnutls-devel gnome-vfs2-devel slang-devel libjpeg-devel libebml libmatroska libmpcdec mDNSResponder-devel cvs update-desktop-files

+Packager:  Carsten Schoene <cs@linux-administrator.com>

+Distribution:  %distribution

-BuildRequires: mad mad-devel libffmpeg0 libffmpeg0-devel libmpeg2 libmpeg2-devel libdvbpsi4 libdvbpsi4-devel

+BuildRoot: %{_tmppath}/%{name}-%{version}-build

+BuildRequires: xorg-x11-devel xorg-x11-libs wxGTK-devel libcdio-devel libcddb-devel libdvdread-devel libdvdnav-devel libogg-devel flac-devel libvorbis-devel SDL-devel aalib-devel esound-devel arts-devel alsa-devel lirc ncurses-devel xosd-devel id3lib-devel aalib fribidi-devel libcaca-devel libdca-devel hal hal-devel libgcrypt SDL_image-devel libgcrypt-devel libid3tag-devel libtheora-devel libsmbclient-devel gnutls-devel gnome-vfs2-devel slang-devel libjpeg-devel libebml libmatroska libmpcdec mDNSResponder-devel cvs update-desktop-files

+BuildRequires: libmp4v2-devel libmpeg2 libmpeg2-devel libdvbpsi5 libdvdplay-devel mad-devel libffmpeg0-devel faad2-devel a52dec x264-devel xvid-devel speex-devel libmodplug libtar

+Requires: libmms

 %if %suse_version >= 1020

 BuildRequires: libmpcdec-devel

 %endif

@@ -30,6 +31,9 @@

 %if %suse_version >= 1010

 BuildRequires: libnotify-devel avahi-devel

 %endif

+%if %suse_version >= 1030

+BuildRequires: libebml-devel

+%endif

 # sysfs is only available since 10.0

 %if %suse_version >= 1000

@@ -127,8 +131,8 @@

 %endif

 %if %suse_version >= 1010

-export CFLAGS="$RPM_OPT_FLAGS  -fstack-protector"

-export CXXFLAGS="$RPM_OPT_FLAGS  -fstack-protector"

+ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"

+ export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector"

 %endif

 %configure \

@@ -144,8 +148,8 @@

    --enable-pth --enable-skins2 --enable-release \

    --enable-mozilla \

 %ifarch %ix86

-   --enable-livedotcom \

-   --with-livedotcom-tree=/usr/%{_lib}/live/ \

+   --enable-live555 \

+   --with-live555-tree=/usr/%{_lib}/live/ \

    --enable-loader \

 %endif

@@ -161,14 +165,14 @@

 %{__ln_s} %{_datadir}/vlc/vlc48x48.png %{buildroot}/%{_datadir}/pixmaps/vlc.png

 %if %suse_version <= 1000

-install -d %{buildroot}/opt/mozilla/%{_lib}/components/

-install -d %{buildroot}/opt/mozilla/%{_lib}/plugins/

-mv %{buildroot}/usr/%{_lib}/mozilla/plugins/libvlcplugin.so %{buildroot}/opt/mozilla/%{_lib}/plugins/

+ install -d %{buildroot}/opt/mozilla/%{_lib}/components/

+ install -d %{buildroot}/opt/mozilla/%{_lib}/plugins/

+ mv %{buildroot}/usr/%{_lib}/mozilla/plugins/libvlcplugin.so %{buildroot}/opt/mozilla/%{_lib}/plugins/

 %endif

 %if %suse_version > 1000

-install -d %{buildroot}/usr/%{_lib}/browser-plugins/#mv %{buildroot}/usr/%{_lib}/mozilla/components/vlcintf.xpt %{buildroot}/usr/%{_lib}/browser-plugins/

-mv %{buildroot}/usr/%{_lib}/mozilla/plugins/libvlcplugin.so %{buildroot}/usr/%{_lib}/browser-plugins/

-rm -rf %{buildroot}/usr/%{_lib}/mozilla

+ install -d %{buildroot}/usr/%{_lib}/browser-plugins/

+ mv %{buildroot}/usr/%{_lib}/mozilla/plugins/libvlcplugin.so %{buildroot}/usr/%{_lib}/browser-plugins/

+ rm -rf %{buildroot}/usr/%{_lib}/mozilla

 %endif

@@ -206,7 +210,6 @@

 /usr/%{_lib}/browser-plugins/*

 %endif

-

 %changelog

 * Wed Dec 05 2007 Carsten Schoene <cs@linux-administrator.com>

 - version changed to 0.8.6d

​