rpms/xine-ui/devel xine-ui.spec,1.7,1.8

[Jussi Lehtola]

Author: jussilehtola

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

Modified Files:
	xine-ui.spec 
Log Message:
Copy working EL-5 spec file back to other branches.


Index: xine-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-ui/devel/xine-ui.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xine-ui.spec	24 Jul 2009 21:13:37 -0000	1.7
+++ xine-ui.spec	24 Jul 2009 22:50:18 -0000	1.8
@@ -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
@@ -156,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
 
@@ -228,6 +231,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %changelog
 * Sat Jul 25 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-15
 - Move xine_splash.png to main package from -skins.
+- Fix EPEL build.
 
 * Thu Jul 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 0.99.5-14
 - Fix build in rawhide.