Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	xine-ui.spec
@@ -1,15 +1,16 @@ +# norootforbuild %define name xine-ui -%define version 0.99.5 -%define release 1 +%define version 0.99.5cvs +%define release 20081221.pm.1343 %define major 1 %define libname libxine%{major} -%define libvers 1.1.0 +%define libvers 1 %define skindir %{_datadir}/xine/skins %define deskdir %{_datadir}/xine/desktop -%define ginstall install -c +%define ginstall install -c Name: %{name} Summary: A Free Audio/Video Player. @@ -21,8 +22,9 @@ Group: Productivity/Multimedia/Video/Players URL: http://xinehq.de -Source0: xine-ui-0.99.5.tar.bz2 +Source0: xine-ui-cvs.tar.bz2 +Patch0: xine-ui-x86-64.diff Requires: %{libname} >= %{libvers} Requires: openssl >= 0.9.6 Requires: curl >= 7.10 @@ -30,17 +32,17 @@ Requires: readline Requires: fontconfig Requires: freetype2 -Requires: libcaca +Requires: libcaca0 Requires: libpng Requires: ncurses -%if %suse_version >= 920 +%if 0%{?suse_version} >= 920 BuildRequires: xorg-x11-libs %else Requires: XFree86-libs %endif BuildRequires: %{libname} >= %{libvers} BuildRequires: %{libname}-devel >= %{libvers} -BuildRequires: libcaca +BuildRequires: libcaca0 BuildRequires: libcaca-devel BuildRequires: curl-devel >= 7.10 BuildRequires: libpng @@ -55,7 +57,14 @@ BuildRequires: pkgconfig BuildRequires: gcc BuildRequires: ncurses-devel -%if %suse_version >= 920 +BuildRequires: lirc +%ifarch i386 i486 i586 i686 i786 i868 i986 k6 k7 athlon x86_64 amd64 ia32e +%if 0%{?suse_version} <= 1100 +BuildRequires: libnvtv +BuildRequires: libnvtv-devel +%endif +%endif +%if 0%{?suse_version} >= 920 BuildRequires: xorg-x11-devel %else BuildRequires: XFree86-devel @@ -79,8 +88,13 @@ werden die xine-Bibliotheken aus libxine verwendet. Weitere Informationen über die unterstützten Formate entnehmen Sie in der Dokumentation zu libxine. +%debug_package + %prep -%setup -n %{name}-%{version} +%setup -n %{name} +%ifarch x86_64 +%patch0 -p1 +%endif %build export CFLAGS="${RPM_OPT_FLAGS}" @@ -103,22 +117,22 @@ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --infodir=%{_infodir} --enable-vdr-keys -make +%{__make} %{?jobs:-j%{jobs}} %install -[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT +[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT} %makeinstall -%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/applications/ -%if %suse_version > 820 +%{__mkdir_p} ${RPM_BUILD_ROOT}/%{_datadir}/applications/ +%if 0%{?suse_version} > 820 %suse_update_desktop_file -i xine AudioVideo Player Video %else -%{__install} -c -m644 $RPM_BUILD_ROOT/%{_datadir}/xine/desktop/xine.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +%{__install} -c -m644 ${RPM_BUILD_ROOT}/%{_datadir}/xine/desktop/xine.desktop ${RPM_BUILD_ROOT}/%{_datadir}/applications/ %endif %{__install} -m 644 misc/desktops/xine.wmconfig %{?buildroot:%{buildroot}}%{deskdir}/ -%{__rm} -rf $RPM_BUILD_ROOT/%{deskdir} +%{__rm} -rf ${RPM_BUILD_ROOT}/%{deskdir} %clean -[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT +[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) @@ -131,6 +145,7 @@ %{_datadir}/xine/oxine/* %{_datadir}/icons/hicolor//apps/xine.png %{_datadir}/applications/xine.desktop +%{_datadir}/mime/packages/xine-ui.xml %lang(de) %{_mandir}/de/man1/ %lang(fr) %{_mandir}/fr/man1/* %lang(es) %{_mandir}/es/man1/* @@ -141,4 +156,3 @@ %changelog * Wed Oct 03 2007 Carsten Schoene <cs@linux-administrator.com> - import for SLE_10 build -
[-] [+]	Added	xine-ui-x86-64.diff ^
@@ -0,0 +1,16 @@ +diff -ur xine-ui.orig/m4/_xine.m4 xine-ui/m4/_xine.m4 +--- xine-ui.orig/m4/_xine.m4 2006-07-02 00:37:56.000000000 +0200 ++++ xine-ui/m4/_xine.m4 2007-10-15 20:39:58.000000000 +0200 +@@ -36,10 +36,10 @@ + if test "$have_lirc" = "yes"; then + + if test x"$LIRC_PREFIX" != "x"; then +- lirc_libprefix="$LIRC_PREFIX/lib" ++ lirc_libprefix="$LIRC_PREFIX/lib64" + LIRC_INCLUDE="-I$LIRC_PREFIX/include" + fi +- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do ++ for llirc in $lirc_libprefix /lib64 /usr/lib64 /usr/local/lib64; do + AC_CHECK_FILE(["$llirc/liblirc_client.a"], + [LIRC_LIBS="$llirc/liblirc_client.a"] + AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblir_client) installed]),,)
	Deleted	xine-ui-0.99.5.tar.bz2 ^
	Added	xine-ui-cvs.tar.bz2 ^