From a05eb363a6f55d64781e0c82dd131af724260c45 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 18 May 2009 04:27:33 +0000 Subject: [PATCH 01/13] Initialize branch EL-5 for xine-ui --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From c9b13ba73b1df5e6f6fa6b94eacd4b79eabcfac6 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Mon, 18 May 2009 05:59:05 +0000 Subject: [PATCH 02/13] Import in Fedora --- sources | 1 + xine-ui-0.99.5-shared-lirc.patch | 62 ++++++ xine-ui.spec | 340 +++++++++++++++++++++++++++++++ 3 files changed, 403 insertions(+) create mode 100644 xine-ui-0.99.5-shared-lirc.patch create mode 100644 xine-ui.spec diff --git a/sources b/sources index e69de29..dbef5e6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e643cd1fcad4d98a5ae4eb877ce5087b xine-ui-0.99.5.tar.gz diff --git a/xine-ui-0.99.5-shared-lirc.patch b/xine-ui-0.99.5-shared-lirc.patch new file mode 100644 index 0000000..06b2f9d --- /dev/null +++ b/xine-ui-0.99.5-shared-lirc.patch @@ -0,0 +1,62 @@ +--- xine-ui-0.99.5/m4/_xine.m4~ 2006-07-01 05:26:26.000000000 +0300 ++++ xine-ui-0.99.5/m4/_xine.m4 2007-07-13 17:29:54.000000000 +0300 +@@ -35,15 +35,7 @@ AC_DEFUN([AC_CHECK_LIRC], + [AC_CHECK_HEADER(lirc/lirc_client.h, true, have_lirc=no)], have_lirc=no) + if test "$have_lirc" = "yes"; then + +- if test x"$LIRC_PREFIX" != "x"; then +- lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" +- fi +- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; 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]),,) +- done ++ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) + else + AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); + fi +--- xine-ui-0.99.5/configure~ 2007-05-01 01:51:18.000000000 +0300 ++++ xine-ui-0.99.5/configure 2007-07-13 17:28:19.000000000 +0300 +@@ -14414,39 +14414,11 @@ fi + + if test "$have_lirc" = "yes"; then + +- if test x"$LIRC_PREFIX" != "x"; then +- lirc_libprefix="$LIRC_PREFIX/lib" +- LIRC_INCLUDE="-I$LIRC_PREFIX/include" +- fi +- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do +- as_ac_File=`echo "ac_cv_file_"$llirc/liblirc_client.a"" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for \"$llirc/liblirc_client.a\"" >&5 +-echo $ECHO_N "checking for \"$llirc/liblirc_client.a\"... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r ""$llirc/liblirc_client.a""; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- LIRC_LIBS="$llirc/liblirc_client.a" +- + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIRC + _ACEOF + +-fi +- +- done ++ LIRC_LIBS=-llirc_client + else + echo "$as_me:$LINENO: result: *** LIRC client support not available, LIRC support will be disabled ***" >&5 + echo "${ECHO_T}*** LIRC client support not available, LIRC support will be disabled ***" >&6; diff --git a/xine-ui.spec b/xine-ui.spec new file mode 100644 index 0000000..edcd5da --- /dev/null +++ b/xine-ui.spec @@ -0,0 +1,340 @@ +# TODO, sometime: nvtvsimple + +Summary: A skinned xlib-based gui for xine-lib +Name: xine-ui +Version: 0.99.5 +Release: 10%{?dist} +License: GPLv2+ +Group: Applications/Multimedia +URL: http://www.xine-project.org/ +Source0: http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz +# Patch to enable linking to shared library version of lirc +Patch0: xine-ui-0.99.5-shared-lirc.patch + +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +# Package was named xine in rpmfusion +Provides: xine = %{version}-%{release} +Obsoletes: xine < %{version}-%{release} + +BuildRequires: aalib-devel >= 1.2.0 +BuildRequires: curl-devel >= 7.10.2 +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: libcaca-devel +BuildRequires: libpng-devel +BuildRequires: libtermcap-devel +BuildRequires: libXft-devel +BuildRequires: libXinerama-devel +BuildRequires: libXt-devel +BuildRequires: libXtst-devel +BuildRequires: libXv-devel +BuildRequires: libXxf86vm-devel +BuildRequires: lirc-devel +BuildRequires: readline-devel +BuildRequires: xine-lib-devel >= 1.1.0 +Conflicts: xine-skins <= 1.0 + +# For dir ownership +Requires: hicolor-icon-theme +# To make aaxine work +Requires: xine-lib-extras + +%description +xine-ui is the default GUI for xine-lib. + +%prep +%setup -q +# Backup time stamp +touch -r m4/_xine.m4 m4/_xine.m4.stamp +%patch0 -p1 +# and restore it +touch -r m4/_xine.m4.stamp m4/_xine.m4 + +# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora +# it's provided by libX11-devel => version the dlopen() +libx11so=$(ls -1 %{_libdir}/libX11.so.? | tail -n 1) +if [ -n "$libx11so" -a -f "$libx11so" ] ; then + sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c +fi + +touch -r configure.ac configure.ac.stamp +sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \ + config.h.in configure.ac configure +touch -r configure.ac.stamp configure.ac + +for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \ + touch -r $f $f.utf8 && \ + mv $f.utf8 $f +done +for f in doc/README_uk ; do + iconv -f koi8-r -t utf-8 $f > $f.utf8 && \ + touch -r $f $f.utf8 && \ + mv $f.utf8 $f +done +for f in doc/man/pl/*.1* doc/README?{cs,pl}* ; do + iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 && \ + touch -r $f $f.utf8 && \ + mv $f.utf8 $f +done + + +%build +%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +%find_lang 'xi\(ne-ui\|tk\)' + +desktop-file-install --remove-category="Application" \ + --add-category="Audio" --add-category="Video" \ + --dir %{buildroot}%{_datadir}/applications misc/desktops/xine.desktop + +# Remove the desktop file installed in the wrong place +rm -rf %{buildroot}%{_datadir}/xine/desktop + +# Remove documentation installed by make install +rm -rf %{buildroot}%{_docdir} + + +%clean +rm -rf %{buildroot} + + +%post +# Mime type +update-desktop-database &> /dev/null || : + +%postun +# Mime type +update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files -f 'xi\(ne-ui\|tk\)'.lang +%defattr(-,root,root,-) +%doc doc/README* +%{_bindir}/aaxine +%{_bindir}/cacaxine +%{_bindir}/fbxine +%{_bindir}/xine +%{_bindir}/xine-bugreport +%{_bindir}/xine-check +%{_bindir}/xine-remote +%{_datadir}/xine/ +%{_datadir}/applications/*xine.desktop +%{_datadir}/icons/hicolor/*x*/apps/xine.png +%{_datadir}/pixmaps/xine.xpm +%{_mandir}/man1/*.1.gz +%lang(de) %{_mandir}/de/man1/*.1.gz +%lang(es) %{_mandir}/es/man1/*.1.gz +%lang(fr) %{_mandir}/fr/man1/*.1.gz +%lang(pl) %{_mandir}/pl/man1/*.1.gz + + +%changelog +* Sun May 17 2009 Jussi Lehtola - 0.99.6-10 +- Use desktop-install --remove-category instead of sed. + +* Sat May 16 2009 Jussi Lehtola - 0.99.5-9 +- More desktop file fixes. +- Fix aaxine by adding Requires: xine-lib-extras. + +* Fri May 15 2009 Jussi Lehtola - 0.99.5-8 +- Conserve time stamps. +- Drop unnecessary desktop file patch. +- Drop unnecessary versioning of dlopen'd libX11.so. +- Add mime type update and fix icon cache update. + +* Fri May 15 2009 Jussi Lehtola - 0.99.5-7 +- Fixes for inclusion into Fedora. + +* Sun Mar 29 2009 Thorsten Leemhuis - 0.99.5-6 +- rebuild for new F11 features + +* Wed Oct 29 2008 Thorsten Leemhuis - 0.99.5-5 +- rebuilt + +* Sun Oct 26 2008 Thorsten Leemhuis - 0.99.5-4 +- rebuilt + +* Mon Aug 04 2008 Thorsten Leemhuis - 0.99.5-1 +- 0.99.5, lots of patches made obsolete. +- Update icon cache and desktop database. +- Patch {aa,caca}xine to dlopen libX11.so.* instead of libX11.so at runtime. +- Patch to look for linux/kd.h instead of linux/kd.hb during build. +- Don't run autotools during build. + +* Thu Mar 01 2007 Thorsten Leemhuis - 0.99.4-11 +- rebuild for new curl + +* Tue Nov 7 2006 Ville Skyttä - 0.99.4-10 +- Re-enable VDR keys and patch, patched xine-lib not required (#1241). + +* Thu Nov 2 2006 Ville Skyttä - 0.99.4-9 +- Drop X-Livna and Application desktop entry categories. + +* Thu Nov 2 2006 Ville Skyttä - 0.99.4-8 +- Make VDR support optional, disabled by default, fixes #1238. + +* Thu Apr 20 2006 Dams - 0.99.4-7 +- Added patch8 to fix up buffer overflow describe in #926 + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Fri Jan 20 2006 Ville Skyttä - 0.99.4-0.lvn.6 +- %%langify non-English manpages, really convert all (and more docs) to UTF-8. +- Improve summary and description. + +* Tue Jan 3 2006 Ville Skyttä - 0.99.4-0.lvn.5 +- Adapt to modular X. +- Drop pre-FC5 workarounds and rpmbuild conditionals. + +* Thu Sep 29 2005 Ville Skyttä - 0.99.4-0.lvn.4 +- Clean up obsolete pre-FC3 stuff (LIRC and CACA now unconditionally enabled). +- Drop zero Epochs. + +* Thu Sep 15 2005 Ville Skyttä - 0:0.99.4-0.lvn.3 +- Apply sprintf, uifixups and xftfontsize patches from Alex Stewart/freshrpms. +- Fix fbxine crash when the tty mode can't be set (upstreamed). +- Fix fbxine usage message and options (upstreamed). +- Make vdr support conditional (default enabled), require vdr-patched xine-lib + if enabled, and build with it for FC4+. +- Build with gcc4 again on FC4+. + +* Sun Aug 14 2005 Ville Skyttä - 0:0.99.4-0.lvn.2 +- Sync VDR patch with vdr-xine-0.7.5 (just for tracking purposes, no changes). + +* Tue Aug 2 2005 Dams - 0:0.99.4-0.lvn.1 +- Updated to 0.99.4 +- Fixed files section +- Dropped patch5 +- Dropped patch3 + +* Sun Jul 10 2005 Ville Skyttä - 0:0.99.3-0.lvn.8 +- Build with compat-gcc-32 for FC4 ("--with gcc32") as a temporary workaround + for spurious directory creation attempts (#419) and possibly other issues. +- Use shared LIRC client libs, possibly enable LIRC support also on x86_64. +- Apply gcc4 menu crash fix, kudos for the patch to freshrpms.net and + Alex Stewart, this'll be handy when we try with gcc4 again (#467). +- Clean up obsolete pre-FC2 stuff. + +* Sat Jun 4 2005 Ville Skyttä - 0:0.99.3-0.lvn.7 +- Apply VDR support update patch from vdr-xine-0.7.4. + +* Sat May 28 2005 Thorsten Leemhuis - 0:0.99.3-0.lvn.6 +- Fix typo + +* Mon May 9 2005 Ville Skyttä - 0:0.99.3-0.lvn.5 +- Add support for CACA, rebuild with "--without caca" to disable (#380). + +* Sat Apr 30 2005 Dams - 0:0.99.3-0.lvn.4 +- Fixed gcc4 build + +* Wed Apr 13 2005 Dams - 0:0.99.3-0.lvn.3 +- Conditional lirc buildreq (default enabled) + +* Sat Jan 1 2005 Ville Skyttä - 0:0.99.3-0.lvn.2 +- Enable support for VDR interaction keys. +- Enable curl unconditionally. +- Build with dependency tracking disabled. + +* Wed Dec 29 2004 Dams - 0:0.99.3-0.lvn.1 +- Updated to 0.99.3 + +* Tue Jul 6 2004 Dams 0:0.99.2-0.lvn.2 +- Updated no-march/mcpu patch +- Updated mkinstalldirs patch + +* Mon Jul 5 2004 Dams 0:0.99.2-0.lvn.1 +- Updated to 0.99.2 + +* Sun Jun 13 2004 Dams 0:0.99.1-0.lvn.3 +- Updated desktop entry for HID compliance + +* Fri May 21 2004 Dams 0:0.99.1-0.lvn.2 +- Updated URL in Source0 + +* Sat Apr 17 2004 Dams 0:0.99.1-0.lvn.1 +- Updated to 0.99.1 + +* Thu Feb 26 2004 Dams 0:0.9.23-0.lvn.2 +- Updated xine-lib version requirement in build dependancy +- Hopefully fixed build for RH9 + +* Thu Dec 25 2003 Dams 0:0.9.23-0.lvn.1 +- s/fedora/livna/ + +* Thu Dec 25 2003 Dams 0:0.9.23-0.fdr.1 +- Updated patch for no march/mcpu from configure + +* Wed Dec 24 2003 Dams 0:0.9.23-0.fdr.1 +- Updated to 0.9.23 + +* Sun Sep 28 2003 Dams 0:0.9.22-0.fdr.4 +- Added patch to fix po/Makefile for servern2 build + +* Sun Aug 31 2003 Dams 0:0.9.22-0.fdr.3 +- Translated manpages iconv'ed into utf-8 encoding + +* Sat Aug 23 2003 Dams 0:0.9.22-0.fdr.2 +- Conflict with old xine-skins packages +- Removed lirc conditionnal build requirement +- Added conditionnal Build dependencies for curl +- Added missing libtool BuildRequires + +* Wed Aug 20 2003 Dams 0:0.9.22-0.fdr.2 +- No more -skins package +- No more url in Source0 + +* Fri Aug 8 2003 Dams 0:0.9.22-0.fdr.1 +- Updated to 0.9.22 + +* Tue Jul 15 2003 Dams 0:0.9.21-0.fdr.3 +- exporting SED=__sed seems to fix build to rh80 + +* Sun Jul 6 2003 Dams 0:0.9.21-0.fdr.2 +- Trying to avoid unowned directories +- Patch for configure not to set march/mcpu. +- Removed BuildArch. + +* Sat May 17 2003 Dams 0:0.9.21-0.fdr.1 +- Updated to 0.9.21 +- buildroot -> RPM_BUILD_ROOT +- Updated URL in Source0 +- Updated BuildRequires + +* Sat Apr 12 2003 Dams 0:0.9.20-0.fdr.5 +- Arch stuff + +* Wed Apr 9 2003 Dams 0:0.9.20-0.fdr.4 +- Fixed typo +- Rebuild, linked against xine-lib 1 beta10 + +* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.3 +- Only one find_lang + +* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.2 +- Added BuildRequires. +- Added --with directives. +- Added use of desktop-file-install +- Added more Requires tag. + +* Thu Apr 3 2003 Dams +- Initial build. From 9eb9e2ba1253254c0370ccec85597ead56b75eb3 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Mon, 18 May 2009 18:10:02 +0000 Subject: [PATCH 03/13] Add missing icon cache update to %post. --- xine-ui.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xine-ui.spec b/xine-ui.spec index edcd5da..5abe23f 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -3,7 +3,7 @@ Summary: A skinned xlib-based gui for xine-lib Name: xine-ui Version: 0.99.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.xine-project.org/ @@ -107,10 +107,13 @@ rm -rf %{buildroot} %post # Mime type update-desktop-database &> /dev/null || : +# Icon cache +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun # Mime type update-desktop-database &> /dev/null || : +# Icon cache if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -142,6 +145,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun May 17 2009 Jussi Lehtola - 0.99.6-11 +- Added missing icon cache update to %%post section. + * Sun May 17 2009 Jussi Lehtola - 0.99.6-10 - Use desktop-install --remove-category instead of sed. From db863c05b7fa8f2cb66a1535b7694c545b0afb97 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 21:13:36 +0000 Subject: [PATCH 04/13] Move xine_splash.png to main package. --- xine-ui.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 103 insertions(+), 10 deletions(-) diff --git a/xine-ui.spec b/xine-ui.spec index 5abe23f..54a96b4 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -3,13 +3,48 @@ Summary: A skinned xlib-based gui for xine-lib Name: xine-ui Version: 0.99.5 -Release: 11%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.xine-project.org/ Source0: http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz # Patch to enable linking to shared library version of lirc Patch0: xine-ui-0.99.5-shared-lirc.patch +# Patch to use UTF-8 documentation, BZ #512598 +Patch1: xine-ui-0.99.5-utf8doc.patch + +# Sources for -skins. Ugh. +Source1: http://xine.sourceforge.net/skins/Antares.tar.gz +Source2: http://xine.sourceforge.net/skins/Bambino-Black.tar.gz +Source3: http://xine.sourceforge.net/skins/Bambino-Blue.tar.gz +Source4: http://xine.sourceforge.net/skins/Bambino-Green.tar.gz +Source5: http://xine.sourceforge.net/skins/Bambino-Orange.tar.gz +Source6: http://xine.sourceforge.net/skins/Bambino-Pink.tar.gz +Source7: http://xine.sourceforge.net/skins/Bambino-Purple.tar.gz +Source8: http://xine.sourceforge.net/skins/Bambino-White.tar.gz +Source9: http://xine.sourceforge.net/skins/blackslim2.tar.gz +Source10: http://xine.sourceforge.net/skins/Bluton.tar.gz +Source11: http://xine.sourceforge.net/skins/caramel.tar.gz +Source12: http://xine.sourceforge.net/skins/CelomaChrome.tar.gz +Source13: http://xine.sourceforge.net/skins/CelomaGold.tar.gz +Source14: http://xine.sourceforge.net/skins/CelomaMdk.tar.gz +Source15: http://xine.sourceforge.net/skins/Centori.tar.gz +Source16: http://xine.sourceforge.net/skins/cloudy.tar.gz +Source17: http://xine.sourceforge.net/skins/concept.tar.gz +Source18: http://xine.sourceforge.net/skins/Crystal.tar.gz +Source19: http://xine.sourceforge.net/skins/Galaxy.tar.gz +Source20: http://xine.sourceforge.net/skins/gudgreen.tar.gz +Source21: http://xine.sourceforge.net/skins/KeramicRH8.tar.gz +Source22: http://xine.sourceforge.net/skins/Keramic.tar.gz +Source23: http://xine.sourceforge.net/skins/lcd.tar.gz +Source24: http://xine.sourceforge.net/skins/mp2k.tar.gz +Source25: http://xine.sourceforge.net/skins/mplayer.tar.gz +Source26: http://xine.sourceforge.net/skins/OMS_legacy.tar.gz +Source27: http://xine.sourceforge.net/skins/pitt.tar.gz +Source28: http://xine.sourceforge.net/skins/Polaris.tar.gz +Source29: http://xine.sourceforge.net/skins/Sunset.tar.gz +Source30: http://xine.sourceforge.net/skins/xinium.tar.gz + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Package was named xine in rpmfusion @@ -24,6 +59,7 @@ BuildRequires: libcaca-devel BuildRequires: libpng-devel BuildRequires: libtermcap-devel BuildRequires: libXft-devel +BuildRequires: libXi-devel BuildRequires: libXinerama-devel BuildRequires: libXt-devel BuildRequires: libXtst-devel @@ -32,21 +68,47 @@ BuildRequires: libXxf86vm-devel BuildRequires: lirc-devel BuildRequires: readline-devel BuildRequires: xine-lib-devel >= 1.1.0 +BuildRequires: xorg-x11-proto-devel Conflicts: xine-skins <= 1.0 # For dir ownership Requires: hicolor-icon-theme +Requires: xine-lib # To make aaxine work Requires: xine-lib-extras %description -xine-ui is the default GUI for xine-lib. +xine-ui is the traditional, skinned GUI for xine-lib. + + +# Skins + +%package skins +Summary: Extra skins for xine-ui +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} +# Package in RPMFusion was named skine-skins +Obsoletes: xine-skins +%if 0%{?fedora}>10 || 0%{?rhel}>5 +BuildArch: noarch +%endif + +%description skins +This package contains extra skins for xine-ui. + %prep -%setup -q +# Setup xine +%setup0 -q +# Setup skins +%setup1 -T -q -c -n %{name}-%{version}/fedoraskins -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 +# Restore directory +%setup -T -D + # Backup time stamp touch -r m4/_xine.m4 m4/_xine.m4.stamp %patch0 -p1 +%patch1 -p1 # and restore it touch -r m4/_xine.m4.stamp m4/_xine.m4 @@ -78,12 +140,17 @@ for f in doc/man/pl/*.1* doc/README?{cs,pl}* ; do mv $f.utf8 $f done +cp -a src/xitk/xine-toolkit/README doc/README.xitk + +# Clean out skins +find fedoraskins/ -type d -name "CVS" -exec rm -rf {} \; || : +find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || : %build -%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib +%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version} +# Set documentation directory make %{?_smp_mflags} - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -96,8 +163,11 @@ desktop-file-install --remove-category="Application" \ # Remove the desktop file installed in the wrong place rm -rf %{buildroot}%{_datadir}/xine/desktop -# Remove documentation installed by make install -rm -rf %{buildroot}%{_docdir} +# Remove automatically installed documentation (listed in %doc) +rm -rf %{buildroot}%{_docdir}/ + +# Install extra skins +cp -a fedoraskins/* %{buildroot}%{_datadir}/xine/skins/ %clean @@ -133,7 +203,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/xine-bugreport %{_bindir}/xine-check %{_bindir}/xine-remote -%{_datadir}/xine/ + +%dir %{_datadir}/xine/skins/ +%{_datadir}/xine/skins/xinetic/ +%{_datadir}/xine/skins/xine_splash.png +%{_datadir}/xine/oxine/ +%{_datadir}/xine/visuals/ + %{_datadir}/applications/*xine.desktop %{_datadir}/icons/hicolor/*x*/apps/xine.png %{_datadir}/pixmaps/xine.xpm @@ -143,12 +219,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %lang(fr) %{_mandir}/fr/man1/*.1.gz %lang(pl) %{_mandir}/pl/man1/*.1.gz +%files skins +%defattr(-,root,root,-) +%{_datadir}/xine/skins/* +%exclude %{_datadir}/xine/skins/xinetic/ +%exclude %{_datadir}/xine/skins/xine_splash.png %changelog -* Sun May 17 2009 Jussi Lehtola - 0.99.6-11 +* Sat Jul 25 2009 Jussi Lehtola - 0.99.5-15 +- Move xine_splash.png to main package from -skins. + +* Thu Jul 23 2009 Jussi Lehtola - 0.99.5-14 +- Fix build in rawhide. + +* Mon Jul 20 2009 Jussi Lehtola - 0.99.5-13 +- Added -skins subpackage. + +* Wed Jul 15 2009 Jussi Lehtola - 0.99.5-12 +- Added BR: xorg-x11-proto-devel. + +* Sun May 17 2009 Jussi Lehtola - 0.99.5-11 - Added missing icon cache update to %%post section. -* Sun May 17 2009 Jussi Lehtola - 0.99.6-10 +* Sun May 17 2009 Jussi Lehtola - 0.99.5-10 - Use desktop-install --remove-category instead of sed. * Sat May 16 2009 Jussi Lehtola - 0.99.5-9 From c13ed8f08e5b7c042d9d6e2fa9646f59094bd17a Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 21:22:25 +0000 Subject: [PATCH 05/13] Add missing sources file from spec file update. --- sources | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sources b/sources index dbef5e6..1191fa7 100644 --- a/sources +++ b/sources @@ -1 +1,31 @@ e643cd1fcad4d98a5ae4eb877ce5087b xine-ui-0.99.5.tar.gz +ad74c35558588f5d4234449a076b4105 Antares.tar.gz +61cbcf4cb3f1443a17e96c0a73eeb3a8 Bambino-Black.tar.gz +56f21a3ffddf0f0980336a5d9cdff179 Bambino-Blue.tar.gz +4d4ee2d1825896ff6c1dadfbf1f75864 Bambino-Green.tar.gz +dacd886be4fd9c13dd96fa3b96f3e7f8 Bambino-Orange.tar.gz +424b4dd516569c92af7d96c10daa46d3 Bambino-Pink.tar.gz +2e6438459244104e46d89a66e5a1f961 Bambino-Purple.tar.gz +3e8bc6f6958e8d732b88f2e227f3c879 Bambino-White.tar.gz +070fd8e3582b6f9e302b595c81dd87e4 Bluton.tar.gz +159b45f013183aea3038f9133f61cf89 CelomaChrome.tar.gz +5ac74cb407b59b3487031a0564698e1f CelomaGold.tar.gz +dadb7b21b8e7e0c40ad7237c4f98906f CelomaMdk.tar.gz +06f2b0f6ceb9456bc26fae65f4f89a53 Centori.tar.gz +eb511cd1217bc0c0bd3fa016698adebc Crystal.tar.gz +c7825e925434374a074c4acc46bcdd4f Galaxy.tar.gz +0154a3eecbeb995865ead852fd5f6bb2 Keramic.tar.gz +bff16e879b75bd5a442c0c5c7dc22bcb KeramicRH8.tar.gz +54b3e28494e1d89e041ceace7db32049 OMS_legacy.tar.gz +b92dfe59cb5f7bbc495ed0be50c1c132 Polaris.tar.gz +8702d138eb61b7149118f91121fe846a Sunset.tar.gz +454bdc7321fc18f0db811db722c2e93c blackslim2.tar.gz +1ff0ea8d7c73c4f3b32c13a408af3be1 caramel.tar.gz +432e0d5135be09e03a69f363d3da94a0 cloudy.tar.gz +34d18380c1077cdf43a04797b2e06734 concept.tar.gz +d809f2f3cce0eae966296e01ede8df00 gudgreen.tar.gz +f16d6a1a39b32473a901d9132c405196 lcd.tar.gz +841924c042ca70700a9d201bc7686e59 mp2k.tar.gz +3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz +7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz +9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz From 17eb317dee991d94dd5eddaced7e1d18035da7ae Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 21:41:12 +0000 Subject: [PATCH 06/13] Add missing file from update. --- xine-ui-0.99.5-utf8doc.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 xine-ui-0.99.5-utf8doc.patch diff --git a/xine-ui-0.99.5-utf8doc.patch b/xine-ui-0.99.5-utf8doc.patch new file mode 100644 index 0000000..e5a7047 --- /dev/null +++ b/xine-ui-0.99.5-utf8doc.patch @@ -0,0 +1,12 @@ +diff -urp xine-ui-0.99.5.orig/src/xitk/help.c xine-ui-0.99.5/src/xitk/help.c +--- xine-ui-0.99.5.orig/src/xitk/help.c 2009-07-19 18:27:09.000000000 +0100 ++++ xine-ui-0.99.5/src/xitk/help.c 2009-07-19 18:27:25.000000000 +0100 +@@ -182,7 +182,7 @@ static void help_sections(void) { + help_add_section(locale_readme, lang->doc_encoding, order_num, section_name); + } + else { +- help_add_section(default_readme, "ISO-8859-1", order_num, section_name); ++ help_add_section(default_readme, "UTF-8", order_num, section_name); + } + } + } From cde6cfe91695bf62fcd5fc9d33d3758d39c69854 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 22:06:31 +0000 Subject: [PATCH 07/13] Fix EPEL build. --- xine-ui.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xine-ui.spec b/xine-ui.spec index 54a96b4..2a93290 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -65,11 +65,14 @@ BuildRequires: libXt-devel BuildRequires: libXtst-devel BuildRequires: libXv-devel BuildRequires: libXxf86vm-devel -BuildRequires: lirc-devel BuildRequires: readline-devel BuildRequires: xine-lib-devel >= 1.1.0 BuildRequires: xorg-x11-proto-devel -Conflicts: xine-skins <= 1.0 + +# Lirc-devel is not available on EPEL-5 +%if 0%{?rhel} == 0 +BuildRequires: lirc-devel +%endif # For dir ownership Requires: hicolor-icon-theme From 23958ce0ded5682c0250395f8eb63c9592a40d3c Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 22:22:49 +0000 Subject: [PATCH 08/13] Fix EPEL build. --- xine-ui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-ui.spec b/xine-ui.spec index 2a93290..732c977 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -159,7 +159,7 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" %find_lang 'xi\(ne-ui\|tk\)' -desktop-file-install --remove-category="Application" \ +desktop-file-install --remove-category="Application" --vendor="" \ --add-category="Audio" --add-category="Video" \ --dir %{buildroot}%{_datadir}/applications misc/desktops/xine.desktop From c5aefb3ebd0b29a13ccda1403eedf982843e5714 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Fri, 24 Jul 2009 22:50:17 +0000 Subject: [PATCH 09/13] Copy working EL-5 spec file back to other branches. --- xine-ui.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xine-ui.spec b/xine-ui.spec index 732c977..b1009c7 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -231,6 +231,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Sat Jul 25 2009 Jussi Lehtola - 0.99.5-15 - Move xine_splash.png to main package from -skins. +- Fix EPEL build. * Thu Jul 23 2009 Jussi Lehtola - 0.99.5-14 - Fix build in rawhide. From e1050b453e830ecc0f13ade0d839d79241b5d426 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Thu, 3 Sep 2009 14:10:12 +0000 Subject: [PATCH 10/13] Move xine-ui_logo.mpv to main package. --- xine-ui.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xine-ui.spec b/xine-ui.spec index b1009c7..45d4569 100644 --- a/xine-ui.spec +++ b/xine-ui.spec @@ -3,7 +3,7 @@ Summary: A skinned xlib-based gui for xine-lib Name: xine-ui Version: 0.99.5 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.xine-project.org/ @@ -209,6 +209,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_datadir}/xine/skins/ %{_datadir}/xine/skins/xinetic/ +%{_datadir}/xine/skins/xine-ui_logo.mpv %{_datadir}/xine/skins/xine_splash.png %{_datadir}/xine/oxine/ %{_datadir}/xine/visuals/ @@ -226,9 +227,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %{_datadir}/xine/skins/* %exclude %{_datadir}/xine/skins/xinetic/ +%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv %exclude %{_datadir}/xine/skins/xine_splash.png %changelog +* Thu Sep 03 2009 Jussi Lehtola - 0.99.5-16 +- Move xine-ui_logo.mpv to main package from -skins. + * Sat Jul 25 2009 Jussi Lehtola - 0.99.5-15 - Move xine_splash.png to main package from -skins. - Fix EPEL build. From c55adfd48172b4eadca407fcf771f9eba5a09dc5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:38 +0000 Subject: [PATCH 11/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 65af246..c428bce 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xine-ui -# $Id$ +# $Id: Makefile,v 1.1 2009/05/18 04:27:28 kevin Exp $ NAME := xine-ui SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From bec3775c1d4c3d2022395dac4acaea433dd1b011 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:16 +0000 Subject: [PATCH 12/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c428bce..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xine-ui -# $Id: Makefile,v 1.1 2009/05/18 04:27:28 kevin Exp $ -NAME := xine-ui -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From bc0a1e1a2f3b16a1d20277f8811567730b6d7bd7 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 20 Dec 2014 18:01:54 +0100 Subject: [PATCH 13/13] 2014-12-20: Retired because of broken deps: unresolved dependencies for xine-ui-0.99.5-16.el5.i386: libcaca.so.0 --- .gitignore | 0 dead.package | 4 + sources | 31 --- xine-ui-0.99.5-shared-lirc.patch | 62 ----- xine-ui-0.99.5-utf8doc.patch | 12 - xine-ui.spec | 448 ------------------------------- 6 files changed, 4 insertions(+), 553 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xine-ui-0.99.5-shared-lirc.patch delete mode 100644 xine-ui-0.99.5-utf8doc.patch delete mode 100644 xine-ui.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f1e5521 --- /dev/null +++ b/dead.package @@ -0,0 +1,4 @@ +2014-12-20: Retired because of broken deps: +unresolved dependencies for xine-ui-0.99.5-16.el5.i386: +libcaca.so.0 + diff --git a/sources b/sources deleted file mode 100644 index 1191fa7..0000000 --- a/sources +++ /dev/null @@ -1,31 +0,0 @@ -e643cd1fcad4d98a5ae4eb877ce5087b xine-ui-0.99.5.tar.gz -ad74c35558588f5d4234449a076b4105 Antares.tar.gz -61cbcf4cb3f1443a17e96c0a73eeb3a8 Bambino-Black.tar.gz -56f21a3ffddf0f0980336a5d9cdff179 Bambino-Blue.tar.gz -4d4ee2d1825896ff6c1dadfbf1f75864 Bambino-Green.tar.gz -dacd886be4fd9c13dd96fa3b96f3e7f8 Bambino-Orange.tar.gz -424b4dd516569c92af7d96c10daa46d3 Bambino-Pink.tar.gz -2e6438459244104e46d89a66e5a1f961 Bambino-Purple.tar.gz -3e8bc6f6958e8d732b88f2e227f3c879 Bambino-White.tar.gz -070fd8e3582b6f9e302b595c81dd87e4 Bluton.tar.gz -159b45f013183aea3038f9133f61cf89 CelomaChrome.tar.gz -5ac74cb407b59b3487031a0564698e1f CelomaGold.tar.gz -dadb7b21b8e7e0c40ad7237c4f98906f CelomaMdk.tar.gz -06f2b0f6ceb9456bc26fae65f4f89a53 Centori.tar.gz -eb511cd1217bc0c0bd3fa016698adebc Crystal.tar.gz -c7825e925434374a074c4acc46bcdd4f Galaxy.tar.gz -0154a3eecbeb995865ead852fd5f6bb2 Keramic.tar.gz -bff16e879b75bd5a442c0c5c7dc22bcb KeramicRH8.tar.gz -54b3e28494e1d89e041ceace7db32049 OMS_legacy.tar.gz -b92dfe59cb5f7bbc495ed0be50c1c132 Polaris.tar.gz -8702d138eb61b7149118f91121fe846a Sunset.tar.gz -454bdc7321fc18f0db811db722c2e93c blackslim2.tar.gz -1ff0ea8d7c73c4f3b32c13a408af3be1 caramel.tar.gz -432e0d5135be09e03a69f363d3da94a0 cloudy.tar.gz -34d18380c1077cdf43a04797b2e06734 concept.tar.gz -d809f2f3cce0eae966296e01ede8df00 gudgreen.tar.gz -f16d6a1a39b32473a901d9132c405196 lcd.tar.gz -841924c042ca70700a9d201bc7686e59 mp2k.tar.gz -3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz -7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz -9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz diff --git a/xine-ui-0.99.5-shared-lirc.patch b/xine-ui-0.99.5-shared-lirc.patch deleted file mode 100644 index 06b2f9d..0000000 --- a/xine-ui-0.99.5-shared-lirc.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- xine-ui-0.99.5/m4/_xine.m4~ 2006-07-01 05:26:26.000000000 +0300 -+++ xine-ui-0.99.5/m4/_xine.m4 2007-07-13 17:29:54.000000000 +0300 -@@ -35,15 +35,7 @@ AC_DEFUN([AC_CHECK_LIRC], - [AC_CHECK_HEADER(lirc/lirc_client.h, true, have_lirc=no)], have_lirc=no) - if test "$have_lirc" = "yes"; then - -- if test x"$LIRC_PREFIX" != "x"; then -- lirc_libprefix="$LIRC_PREFIX/lib" -- LIRC_INCLUDE="-I$LIRC_PREFIX/include" -- fi -- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; 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]),,) -- done -+ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]) - else - AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]); - fi ---- xine-ui-0.99.5/configure~ 2007-05-01 01:51:18.000000000 +0300 -+++ xine-ui-0.99.5/configure 2007-07-13 17:28:19.000000000 +0300 -@@ -14414,39 +14414,11 @@ fi - - if test "$have_lirc" = "yes"; then - -- if test x"$LIRC_PREFIX" != "x"; then -- lirc_libprefix="$LIRC_PREFIX/lib" -- LIRC_INCLUDE="-I$LIRC_PREFIX/include" -- fi -- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do -- as_ac_File=`echo "ac_cv_file_"$llirc/liblirc_client.a"" | $as_tr_sh` --echo "$as_me:$LINENO: checking for \"$llirc/liblirc_client.a\"" >&5 --echo $ECHO_N "checking for \"$llirc/liblirc_client.a\"... $ECHO_C" >&6 --if eval "test \"\${$as_ac_File+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- test "$cross_compiling" = yes && -- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 --echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -- { (exit 1); exit 1; }; } --if test -r ""$llirc/liblirc_client.a""; then -- eval "$as_ac_File=yes" --else -- eval "$as_ac_File=no" --fi --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 --if test `eval echo '${'$as_ac_File'}'` = yes; then -- LIRC_LIBS="$llirc/liblirc_client.a" -- - cat >>confdefs.h <<\_ACEOF - #define HAVE_LIRC - _ACEOF - --fi -- -- done -+ LIRC_LIBS=-llirc_client - else - echo "$as_me:$LINENO: result: *** LIRC client support not available, LIRC support will be disabled ***" >&5 - echo "${ECHO_T}*** LIRC client support not available, LIRC support will be disabled ***" >&6; diff --git a/xine-ui-0.99.5-utf8doc.patch b/xine-ui-0.99.5-utf8doc.patch deleted file mode 100644 index e5a7047..0000000 --- a/xine-ui-0.99.5-utf8doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp xine-ui-0.99.5.orig/src/xitk/help.c xine-ui-0.99.5/src/xitk/help.c ---- xine-ui-0.99.5.orig/src/xitk/help.c 2009-07-19 18:27:09.000000000 +0100 -+++ xine-ui-0.99.5/src/xitk/help.c 2009-07-19 18:27:25.000000000 +0100 -@@ -182,7 +182,7 @@ static void help_sections(void) { - help_add_section(locale_readme, lang->doc_encoding, order_num, section_name); - } - else { -- help_add_section(default_readme, "ISO-8859-1", order_num, section_name); -+ help_add_section(default_readme, "UTF-8", order_num, section_name); - } - } - } diff --git a/xine-ui.spec b/xine-ui.spec deleted file mode 100644 index 45d4569..0000000 --- a/xine-ui.spec +++ /dev/null @@ -1,448 +0,0 @@ -# TODO, sometime: nvtvsimple - -Summary: A skinned xlib-based gui for xine-lib -Name: xine-ui -Version: 0.99.5 -Release: 16%{?dist} -License: GPLv2+ -Group: Applications/Multimedia -URL: http://www.xine-project.org/ -Source0: http://downloads.sourceforge.net/xine/xine-ui-%{version}.tar.gz -# Patch to enable linking to shared library version of lirc -Patch0: xine-ui-0.99.5-shared-lirc.patch -# Patch to use UTF-8 documentation, BZ #512598 -Patch1: xine-ui-0.99.5-utf8doc.patch - -# Sources for -skins. Ugh. -Source1: http://xine.sourceforge.net/skins/Antares.tar.gz -Source2: http://xine.sourceforge.net/skins/Bambino-Black.tar.gz -Source3: http://xine.sourceforge.net/skins/Bambino-Blue.tar.gz -Source4: http://xine.sourceforge.net/skins/Bambino-Green.tar.gz -Source5: http://xine.sourceforge.net/skins/Bambino-Orange.tar.gz -Source6: http://xine.sourceforge.net/skins/Bambino-Pink.tar.gz -Source7: http://xine.sourceforge.net/skins/Bambino-Purple.tar.gz -Source8: http://xine.sourceforge.net/skins/Bambino-White.tar.gz -Source9: http://xine.sourceforge.net/skins/blackslim2.tar.gz -Source10: http://xine.sourceforge.net/skins/Bluton.tar.gz -Source11: http://xine.sourceforge.net/skins/caramel.tar.gz -Source12: http://xine.sourceforge.net/skins/CelomaChrome.tar.gz -Source13: http://xine.sourceforge.net/skins/CelomaGold.tar.gz -Source14: http://xine.sourceforge.net/skins/CelomaMdk.tar.gz -Source15: http://xine.sourceforge.net/skins/Centori.tar.gz -Source16: http://xine.sourceforge.net/skins/cloudy.tar.gz -Source17: http://xine.sourceforge.net/skins/concept.tar.gz -Source18: http://xine.sourceforge.net/skins/Crystal.tar.gz -Source19: http://xine.sourceforge.net/skins/Galaxy.tar.gz -Source20: http://xine.sourceforge.net/skins/gudgreen.tar.gz -Source21: http://xine.sourceforge.net/skins/KeramicRH8.tar.gz -Source22: http://xine.sourceforge.net/skins/Keramic.tar.gz -Source23: http://xine.sourceforge.net/skins/lcd.tar.gz -Source24: http://xine.sourceforge.net/skins/mp2k.tar.gz -Source25: http://xine.sourceforge.net/skins/mplayer.tar.gz -Source26: http://xine.sourceforge.net/skins/OMS_legacy.tar.gz -Source27: http://xine.sourceforge.net/skins/pitt.tar.gz -Source28: http://xine.sourceforge.net/skins/Polaris.tar.gz -Source29: http://xine.sourceforge.net/skins/Sunset.tar.gz -Source30: http://xine.sourceforge.net/skins/xinium.tar.gz - - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -# Package was named xine in rpmfusion -Provides: xine = %{version}-%{release} -Obsoletes: xine < %{version}-%{release} - -BuildRequires: aalib-devel >= 1.2.0 -BuildRequires: curl-devel >= 7.10.2 -BuildRequires: desktop-file-utils -BuildRequires: gettext -BuildRequires: libcaca-devel -BuildRequires: libpng-devel -BuildRequires: libtermcap-devel -BuildRequires: libXft-devel -BuildRequires: libXi-devel -BuildRequires: libXinerama-devel -BuildRequires: libXt-devel -BuildRequires: libXtst-devel -BuildRequires: libXv-devel -BuildRequires: libXxf86vm-devel -BuildRequires: readline-devel -BuildRequires: xine-lib-devel >= 1.1.0 -BuildRequires: xorg-x11-proto-devel - -# Lirc-devel is not available on EPEL-5 -%if 0%{?rhel} == 0 -BuildRequires: lirc-devel -%endif - -# For dir ownership -Requires: hicolor-icon-theme -Requires: xine-lib -# To make aaxine work -Requires: xine-lib-extras - -%description -xine-ui is the traditional, skinned GUI for xine-lib. - - -# Skins - -%package skins -Summary: Extra skins for xine-ui -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# Package in RPMFusion was named skine-skins -Obsoletes: xine-skins -%if 0%{?fedora}>10 || 0%{?rhel}>5 -BuildArch: noarch -%endif - -%description skins -This package contains extra skins for xine-ui. - - -%prep -# Setup xine -%setup0 -q -# Setup skins -%setup1 -T -q -c -n %{name}-%{version}/fedoraskins -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -# Restore directory -%setup -T -D - -# Backup time stamp -touch -r m4/_xine.m4 m4/_xine.m4.stamp -%patch0 -p1 -%patch1 -p1 -# and restore it -touch -r m4/_xine.m4.stamp m4/_xine.m4 - -# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora -# it's provided by libX11-devel => version the dlopen() -libx11so=$(ls -1 %{_libdir}/libX11.so.? | tail -n 1) -if [ -n "$libx11so" -a -f "$libx11so" ] ; then - sed -i -e "s/\"libX11\\.so\"/\"$(basename $libx11so)\"/" src/aaui/main.c -fi - -touch -r configure.ac configure.ac.stamp -sed -i -e 's/LINUX_KD_HB/LINUX_KD_H/g;s|linux/kd\.hb|linux/kd.h|g' \ - config.h.in configure.ac configure -touch -r configure.ac.stamp configure.ac - -for f in doc/man/{de,es,fr}/*.1* doc/README?{cs,de,es,fi,fr,it} ; do - iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done -for f in doc/README_uk ; do - iconv -f koi8-r -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done -for f in doc/man/pl/*.1* doc/README?{cs,pl}* ; do - iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 && \ - touch -r $f $f.utf8 && \ - mv $f.utf8 $f -done - -cp -a src/xitk/xine-toolkit/README doc/README.xitk - -# Clean out skins -find fedoraskins/ -type d -name "CVS" -exec rm -rf {} \; || : -find fedoraskins/ -type d -name ".xvpics" -exec rm -rf {} \; || : - -%build -%configure --disable-dependency-tracking --enable-vdr-keys --with-aalib XINE_DOCPATH=%{_docdir}/%{name}-%{version} -# Set documentation directory -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" -%find_lang 'xi\(ne-ui\|tk\)' - -desktop-file-install --remove-category="Application" --vendor="" \ - --add-category="Audio" --add-category="Video" \ - --dir %{buildroot}%{_datadir}/applications misc/desktops/xine.desktop - -# Remove the desktop file installed in the wrong place -rm -rf %{buildroot}%{_datadir}/xine/desktop - -# Remove automatically installed documentation (listed in %doc) -rm -rf %{buildroot}%{_docdir}/ - -# Install extra skins -cp -a fedoraskins/* %{buildroot}%{_datadir}/xine/skins/ - - -%clean -rm -rf %{buildroot} - - -%post -# Mime type -update-desktop-database &> /dev/null || : -# Icon cache -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -# Mime type -update-desktop-database &> /dev/null || : -# Icon cache -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - -%files -f 'xi\(ne-ui\|tk\)'.lang -%defattr(-,root,root,-) -%doc doc/README* -%{_bindir}/aaxine -%{_bindir}/cacaxine -%{_bindir}/fbxine -%{_bindir}/xine -%{_bindir}/xine-bugreport -%{_bindir}/xine-check -%{_bindir}/xine-remote - -%dir %{_datadir}/xine/skins/ -%{_datadir}/xine/skins/xinetic/ -%{_datadir}/xine/skins/xine-ui_logo.mpv -%{_datadir}/xine/skins/xine_splash.png -%{_datadir}/xine/oxine/ -%{_datadir}/xine/visuals/ - -%{_datadir}/applications/*xine.desktop -%{_datadir}/icons/hicolor/*x*/apps/xine.png -%{_datadir}/pixmaps/xine.xpm -%{_mandir}/man1/*.1.gz -%lang(de) %{_mandir}/de/man1/*.1.gz -%lang(es) %{_mandir}/es/man1/*.1.gz -%lang(fr) %{_mandir}/fr/man1/*.1.gz -%lang(pl) %{_mandir}/pl/man1/*.1.gz - -%files skins -%defattr(-,root,root,-) -%{_datadir}/xine/skins/* -%exclude %{_datadir}/xine/skins/xinetic/ -%exclude %{_datadir}/xine/skins/xine-ui_logo.mpv -%exclude %{_datadir}/xine/skins/xine_splash.png - -%changelog -* Thu Sep 03 2009 Jussi Lehtola - 0.99.5-16 -- Move xine-ui_logo.mpv to main package from -skins. - -* Sat Jul 25 2009 Jussi Lehtola - 0.99.5-15 -- Move xine_splash.png to main package from -skins. -- Fix EPEL build. - -* Thu Jul 23 2009 Jussi Lehtola - 0.99.5-14 -- Fix build in rawhide. - -* Mon Jul 20 2009 Jussi Lehtola - 0.99.5-13 -- Added -skins subpackage. - -* Wed Jul 15 2009 Jussi Lehtola - 0.99.5-12 -- Added BR: xorg-x11-proto-devel. - -* Sun May 17 2009 Jussi Lehtola - 0.99.5-11 -- Added missing icon cache update to %%post section. - -* Sun May 17 2009 Jussi Lehtola - 0.99.5-10 -- Use desktop-install --remove-category instead of sed. - -* Sat May 16 2009 Jussi Lehtola - 0.99.5-9 -- More desktop file fixes. -- Fix aaxine by adding Requires: xine-lib-extras. - -* Fri May 15 2009 Jussi Lehtola - 0.99.5-8 -- Conserve time stamps. -- Drop unnecessary desktop file patch. -- Drop unnecessary versioning of dlopen'd libX11.so. -- Add mime type update and fix icon cache update. - -* Fri May 15 2009 Jussi Lehtola - 0.99.5-7 -- Fixes for inclusion into Fedora. - -* Sun Mar 29 2009 Thorsten Leemhuis - 0.99.5-6 -- rebuild for new F11 features - -* Wed Oct 29 2008 Thorsten Leemhuis - 0.99.5-5 -- rebuilt - -* Sun Oct 26 2008 Thorsten Leemhuis - 0.99.5-4 -- rebuilt - -* Mon Aug 04 2008 Thorsten Leemhuis - 0.99.5-1 -- 0.99.5, lots of patches made obsolete. -- Update icon cache and desktop database. -- Patch {aa,caca}xine to dlopen libX11.so.* instead of libX11.so at runtime. -- Patch to look for linux/kd.h instead of linux/kd.hb during build. -- Don't run autotools during build. - -* Thu Mar 01 2007 Thorsten Leemhuis - 0.99.4-11 -- rebuild for new curl - -* Tue Nov 7 2006 Ville Skyttä - 0.99.4-10 -- Re-enable VDR keys and patch, patched xine-lib not required (#1241). - -* Thu Nov 2 2006 Ville Skyttä - 0.99.4-9 -- Drop X-Livna and Application desktop entry categories. - -* Thu Nov 2 2006 Ville Skyttä - 0.99.4-8 -- Make VDR support optional, disabled by default, fixes #1238. - -* Thu Apr 20 2006 Dams - 0.99.4-7 -- Added patch8 to fix up buffer overflow describe in #926 - -* Thu Mar 09 2006 Andreas Bierfert -- switch to new release field - -* Tue Feb 28 2006 Andreas Bierfert -- add dist - -* Fri Jan 20 2006 Ville Skyttä - 0.99.4-0.lvn.6 -- %%langify non-English manpages, really convert all (and more docs) to UTF-8. -- Improve summary and description. - -* Tue Jan 3 2006 Ville Skyttä - 0.99.4-0.lvn.5 -- Adapt to modular X. -- Drop pre-FC5 workarounds and rpmbuild conditionals. - -* Thu Sep 29 2005 Ville Skyttä - 0.99.4-0.lvn.4 -- Clean up obsolete pre-FC3 stuff (LIRC and CACA now unconditionally enabled). -- Drop zero Epochs. - -* Thu Sep 15 2005 Ville Skyttä - 0:0.99.4-0.lvn.3 -- Apply sprintf, uifixups and xftfontsize patches from Alex Stewart/freshrpms. -- Fix fbxine crash when the tty mode can't be set (upstreamed). -- Fix fbxine usage message and options (upstreamed). -- Make vdr support conditional (default enabled), require vdr-patched xine-lib - if enabled, and build with it for FC4+. -- Build with gcc4 again on FC4+. - -* Sun Aug 14 2005 Ville Skyttä - 0:0.99.4-0.lvn.2 -- Sync VDR patch with vdr-xine-0.7.5 (just for tracking purposes, no changes). - -* Tue Aug 2 2005 Dams - 0:0.99.4-0.lvn.1 -- Updated to 0.99.4 -- Fixed files section -- Dropped patch5 -- Dropped patch3 - -* Sun Jul 10 2005 Ville Skyttä - 0:0.99.3-0.lvn.8 -- Build with compat-gcc-32 for FC4 ("--with gcc32") as a temporary workaround - for spurious directory creation attempts (#419) and possibly other issues. -- Use shared LIRC client libs, possibly enable LIRC support also on x86_64. -- Apply gcc4 menu crash fix, kudos for the patch to freshrpms.net and - Alex Stewart, this'll be handy when we try with gcc4 again (#467). -- Clean up obsolete pre-FC2 stuff. - -* Sat Jun 4 2005 Ville Skyttä - 0:0.99.3-0.lvn.7 -- Apply VDR support update patch from vdr-xine-0.7.4. - -* Sat May 28 2005 Thorsten Leemhuis - 0:0.99.3-0.lvn.6 -- Fix typo - -* Mon May 9 2005 Ville Skyttä - 0:0.99.3-0.lvn.5 -- Add support for CACA, rebuild with "--without caca" to disable (#380). - -* Sat Apr 30 2005 Dams - 0:0.99.3-0.lvn.4 -- Fixed gcc4 build - -* Wed Apr 13 2005 Dams - 0:0.99.3-0.lvn.3 -- Conditional lirc buildreq (default enabled) - -* Sat Jan 1 2005 Ville Skyttä - 0:0.99.3-0.lvn.2 -- Enable support for VDR interaction keys. -- Enable curl unconditionally. -- Build with dependency tracking disabled. - -* Wed Dec 29 2004 Dams - 0:0.99.3-0.lvn.1 -- Updated to 0.99.3 - -* Tue Jul 6 2004 Dams 0:0.99.2-0.lvn.2 -- Updated no-march/mcpu patch -- Updated mkinstalldirs patch - -* Mon Jul 5 2004 Dams 0:0.99.2-0.lvn.1 -- Updated to 0.99.2 - -* Sun Jun 13 2004 Dams 0:0.99.1-0.lvn.3 -- Updated desktop entry for HID compliance - -* Fri May 21 2004 Dams 0:0.99.1-0.lvn.2 -- Updated URL in Source0 - -* Sat Apr 17 2004 Dams 0:0.99.1-0.lvn.1 -- Updated to 0.99.1 - -* Thu Feb 26 2004 Dams 0:0.9.23-0.lvn.2 -- Updated xine-lib version requirement in build dependancy -- Hopefully fixed build for RH9 - -* Thu Dec 25 2003 Dams 0:0.9.23-0.lvn.1 -- s/fedora/livna/ - -* Thu Dec 25 2003 Dams 0:0.9.23-0.fdr.1 -- Updated patch for no march/mcpu from configure - -* Wed Dec 24 2003 Dams 0:0.9.23-0.fdr.1 -- Updated to 0.9.23 - -* Sun Sep 28 2003 Dams 0:0.9.22-0.fdr.4 -- Added patch to fix po/Makefile for servern2 build - -* Sun Aug 31 2003 Dams 0:0.9.22-0.fdr.3 -- Translated manpages iconv'ed into utf-8 encoding - -* Sat Aug 23 2003 Dams 0:0.9.22-0.fdr.2 -- Conflict with old xine-skins packages -- Removed lirc conditionnal build requirement -- Added conditionnal Build dependencies for curl -- Added missing libtool BuildRequires - -* Wed Aug 20 2003 Dams 0:0.9.22-0.fdr.2 -- No more -skins package -- No more url in Source0 - -* Fri Aug 8 2003 Dams 0:0.9.22-0.fdr.1 -- Updated to 0.9.22 - -* Tue Jul 15 2003 Dams 0:0.9.21-0.fdr.3 -- exporting SED=__sed seems to fix build to rh80 - -* Sun Jul 6 2003 Dams 0:0.9.21-0.fdr.2 -- Trying to avoid unowned directories -- Patch for configure not to set march/mcpu. -- Removed BuildArch. - -* Sat May 17 2003 Dams 0:0.9.21-0.fdr.1 -- Updated to 0.9.21 -- buildroot -> RPM_BUILD_ROOT -- Updated URL in Source0 -- Updated BuildRequires - -* Sat Apr 12 2003 Dams 0:0.9.20-0.fdr.5 -- Arch stuff - -* Wed Apr 9 2003 Dams 0:0.9.20-0.fdr.4 -- Fixed typo -- Rebuild, linked against xine-lib 1 beta10 - -* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.3 -- Only one find_lang - -* Mon Apr 7 2003 Dams 0:0.9.20-0.fdr.2 -- Added BuildRequires. -- Added --with directives. -- Added use of desktop-file-install -- Added more Requires tag. - -* Thu Apr 3 2003 Dams -- Initial build.