rpms/xine-ui/EL-5 xine-ui.spec,1.2,1.3

Fri Jul 24 21:13:36 UTC 2009

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28345/EL-5

Modified Files:
	xine-ui.spec 
Log Message:
Move xine_splash.png to main package.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/EL-5/xine-ui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- xine-ui.spec	18 May 2009 18:10:02 -0000	1.2
+++ xine-ui.spec	24 Jul 2009 21:13:36 -0000	1.3
@@ -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,
      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="
 # 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/
 %{_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/
 %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 <jussi.lehtola at iki.fi> - 0.99.6-11
+* Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
+- Move xine_splash.png to main package from -skins.
+
+* Thu Jul 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-14
+- Fix build in rawhide.
+
+* Mon Jul 20 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-13
+- Added -skins subpackage.
+
+* Wed Jul 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-12
+- Added BR: xorg-x11-proto-devel.
+
+* Sun May 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.99.5-11
 - Added missing icon cache update to %%post section.
 
-* Sun May 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.99.6-10
+* Sun May 17 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.99.5-10
 - Use desktop-install --remove-category instead of sed.
 
 * Sat May 16 2009 Jussi Lehtola <jussi.lehtola at iki.fi> - 0.99.5-9


