rpms/xine-ui/devel xine-ui-0.99.5-utf8doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 xine-ui.spec, 1.3, 1.4

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/xine-ui/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19406/devel

Modified Files:
	.cvsignore import.log sources xine-ui.spec 
Added Files:
	xine-ui-0.99.5-utf8doc.patch 
Log Message:
Fix BZ #512598 & #512604.

xine-ui-0.99.5-utf8doc.patch:
 help.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xine-ui-0.99.5-utf8doc.patch ---
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);
 	}
       }
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 May 2009 05:56:12 -0000	1.2
+++ .cvsignore	19 Jul 2009 23:22:34 -0000	1.3
@@ -1 +1,31 @@
 xine-ui-0.99.5.tar.gz
+Antares.tar.gz
+Bambino-Black.tar.gz
+Bambino-Blue.tar.gz
+Bambino-Green.tar.gz
+Bambino-Orange.tar.gz
+Bambino-Pink.tar.gz
+Bambino-Purple.tar.gz
+Bambino-White.tar.gz
+Bluton.tar.gz
+CelomaChrome.tar.gz
+CelomaGold.tar.gz
+CelomaMdk.tar.gz
+Centori.tar.gz
+Crystal.tar.gz
+Galaxy.tar.gz
+Keramic.tar.gz
+KeramicRH8.tar.gz
+OMS_legacy.tar.gz
+Polaris.tar.gz
+Sunset.tar.gz
+blackslim2.tar.gz
+caramel.tar.gz
+cloudy.tar.gz
+concept.tar.gz
+gudgreen.tar.gz
+lcd.tar.gz
+mp2k.tar.gz
+mplayer.tar.gz
+pitt.tar.gz
+xinium.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	18 May 2009 05:56:12 -0000	1.1
+++ import.log	19 Jul 2009 23:22:34 -0000	1.2
@@ -1 +1,2 @@
 xine-ui-0_99_5-10_fc10:HEAD:xine-ui-0.99.5-10.fc10.src.rpm:1242625874
+xine-ui-0_99_5-13_fc11:HEAD:xine-ui-0.99.5-13.fc11.src.rpm:1248045652


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 May 2009 05:56:12 -0000	1.2
+++ sources	19 Jul 2009 23:22:34 -0000	1.3
@@ -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


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xine-ui.spec	15 Jul 2009 08:26:13 -0000	1.3
+++ xine-ui.spec	19 Jul 2009 23:22:34 -0000	1.4
@@ -3,13 +3,48 @@
 Summary:        A skinned xlib-based gui for xine-lib
 Name:           xine-ui
 Version:        0.99.5
-Release:        12%{?dist}
+Release:        13%{?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
@@ -32,22 +67,47 @@ BuildRequires:  libXxf86vm-devel
 BuildRequires:  lirc-devel
 BuildRequires:  readline-devel
 BuildRequires:  xine-lib-devel >= 1.1.0
-BuildRequires:	xorg-x11-proto-devel
+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
 
@@ -79,12 +139,15 @@ for f in doc/man/pl/*.1* doc/README?{cs,
      mv $f.utf8 $f
 done
 
+# 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"
@@ -97,8 +160,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
@@ -134,7 +200,12 @@ 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/oxine/
+%{_datadir}/xine/visuals/
+
 %{_datadir}/applications/*xine.desktop
 %{_datadir}/icons/hicolor/*x*/apps/xine.png
 %{_datadir}/pixmaps/xine.xpm
@@ -144,15 +215,22 @@ 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/
 
 %changelog
-* Wed Jul 15 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.6-12
+* 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.6-11
+* 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