SPECS: bmpx.spec - added conditional build - with gstreamer - remo...

[troll]

Author: troll                        Date: Fri Sep 30 03:46:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added conditional build - with gstreamer
- removed redundant BRs: GConf2-devel, gnome-vfs2-devel, home-etc-devel,
  pkgconfig
- changed configure options (the previous ones were for bmp not bmpx)
- don't include GPL licence text
- move desktop icon from _iconsdir to _pixmapsdir
- rel 0.2, descriptions still require changing

---- Files affected:
SPECS:
   bmpx.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/bmpx.spec
diff -u SPECS/bmpx.spec:1.1 SPECS/bmpx.spec:1.2
--- SPECS/bmpx.spec:1.1	Fri Sep 30 03:27:33 2005
+++ SPECS/bmpx.spec	Fri Sep 30 05:46:06 2005
@@ -1,10 +1,13 @@
 # $Revision$, $Date$
 #
+# Conditional build:
+%bcond_with	gstreamer	# build with GStreamer support (instead of XINE)
+
 Summary:	Sound player with the WinAmp GUI, for Unix-based systems for GTK+2
 Summary(pl):	Odtwarzacz dźwięku z interfejsem WinAmpa dla GTK+2
 Name:		bmpx
 Version:	0.11.5
-Release:	0.1
+Release:	0.2
 Epoch:		1
 License:	GPL
 Group:		Applications/Sound
@@ -18,14 +21,13 @@
 BuildRequires:	curl-devel
 BuildRequires:	esound-devel >= 0.2.8
 BuildRequires:	fam-devel
-BuildRequires:  GConf2-devel >= 2.4.0
-BuildRequires:  gnome-vfs2-devel >= 2.4.0
 BuildRequires:	gtk+2-devel >= 2:2.8.0
-BuildRequires:	home-etc-devel
 BuildRequires:	libvorbis-devel >= 1:1.0
 BuildRequires:	libglade2-devel >= 2.5.1
-BuildRequires:	pkgconfig
 BuildRequires:	taglib-devel
+%if %{with gstreamer}
+BuildRequires:	gstreamer-devel >= 0.9.1
+%else
 BuildRequires:	xine-lib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,16 +52,13 @@
 %{__autoheader}
 %{__automake}
 %configure \
-%ifarch %{ix86}
-%ifnarch i386 i486
-	--enable-simd \
-%endif
+%if %{with gstreamer}
+	--enable-gst \
 %else
-	--disable-simd \
+	--enable-xine \
 %endif
-	--enable-gnome-vfs \
-	--enable-gconf \
-	--enable-shared
+	--enable-shared \
+	--enable-static
 %{__make}
 
 %install
@@ -69,6 +68,12 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	m4datadir=%{_aclocaldir}
 
+rm -f $RPM_BUILD_ROOT%{_datadir}/bmpx/data/GPL.txt
+
+install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+mv -f $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/bmpx.png \
+	$RPM_BUILD_ROOT%{_pixmapsdir}
+
 %find_lang %{name}
 
 %clean
@@ -89,7 +94,7 @@
 %{_desktopdir}/*
 %{_datadir}/bmpx
 %{_datadir}/bmp-remote
-%{_iconsdir}/*/*/*/*
+%{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -97,6 +102,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/09/30 03:46:06  troll
+- added conditional build - with gstreamer
+- removed redundant BRs: GConf2-devel, gnome-vfs2-devel, home-etc-devel,
+  pkgconfig
+- changed configure options (the previous ones were for bmp not bmpx)
+- don't include GPL licence text
+- move desktop icon from _iconsdir to _pixmapsdir
+- rel 0.2, descriptions still require changing
+
 Revision 1.1  2005/09/30 01:27:33  patrys
 - Initial PLD release
 - needs a review and proper descriptions
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bmpx.spec?r1=1.1&r2=1.2&f=u