SPECS (AC-branch): mplayer.spec - unify

[glen]

Author: glen                         Date: Sat Dec  9 22:36:10 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- unify

---- Files affected:
SPECS:
   mplayer.spec (1.354.2.2 -> 1.354.2.3) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.354.2.2 SPECS/mplayer.spec:1.354.2.3
--- SPECS/mplayer.spec:1.354.2.2	Sat Dec  9 15:06:45 2006
+++ SPECS/mplayer.spec	Sat Dec  9 23:36:04 2006
@@ -148,6 +148,8 @@
 %if %{with gui}
 BuildRequires:	gtk+2-devel
 %endif
+BuildRequires:	XFree86-devel >= 4.0.2
+%{?with_gnomess:BuildRequires:	dbus-glib-devel}
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	lame-libs-devel
 %{?with_caca:BuildRequires:	libcaca-devel}
@@ -163,8 +165,6 @@
 %{?with_dshow:BuildRequires:	libstdc++-devel}
 %{?with_theora:BuildRequires:	libtheora-devel}
 # tremor is used by default, internal as we don't have system one
-BuildRequires:	XFree86-devel >= 4.0.2
-%{?with_gnomess:BuildRequires:	dbus-glib-devel}
 #%{?with_vorbis:BuildRequires:	libvorbis-devel}
 %{?with_x264:BuildRequires:	libx264-devel >= 0.1.2-1.20060828_2245.1}
 BuildRequires:	libxslt-progs
@@ -531,10 +531,10 @@
 
 %postun -n gmplayer
 umask 022
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
 
-%post vidix -p /sbin/ldconfig
-%postun vidix -p /sbin/ldconfig
+%post	vidix -p /sbin/ldconfig
+%postun	vidix -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -618,6 +618,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.354.2.3  2006/12/09 22:36:04  glen
+- unify
+
 Revision 1.354.2.2  2006/12/09 14:06:45  glen
 - -vidix subpackage
 - corrected deps and scriptlets
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.354.2.2&r2=1.354.2.3&f=u