SPECS: muine.spec - merged from DEVEL

wolf wolf at pld-linux.org
Mon Aug 15 18:54:44 CEST 2005


Author: wolf                         Date: Mon Aug 15 16:54:44 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   muine.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/muine.spec
diff -u SPECS/muine.spec:1.37 SPECS/muine.spec:1.38
--- SPECS/muine.spec:1.37	Mon Aug 15 15:22:26 2005
+++ SPECS/muine.spec	Mon Aug 15 18:54:34 2005
@@ -22,18 +22,13 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	dotnet-dbus-sharp-devel >= 0.21
+BuildRequires:	dotnet-gtk-sharp2-gnome-devel >= 1.9.3
+BuildRequires:	faad2-devel
 BuildRequires:	flac-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gnome-vfs2-devel >= 2.4.0
-%if %{with gstreamer}
-BuildRequires:	gstreamer-devel >= %{min_ver}
-BuildRequires:	gstreamer-GConf-devel >= %{min_ver}
-BuildRequires:	gstreamer-plugins-devel >= %{min_ver}
-%endif
-BuildRequires:	dotnet-gtk-sharp-devel >= 0.98
-BuildRequires:	dotnet-dbus-sharp-devel >= 0.21
-BuildRequires:	faad2-devel
 BuildRequires:	gtk+2-devel >= 1:2.0.4
 BuildRequires:	intltool >= 0.21
 BuildRequires:	libgnome-devel
@@ -41,22 +36,27 @@
 BuildRequires:	libogg-devel
 BuildRequires:	libtool
 BuildRequires:	libvorbis-devel
-BuildRequires:	mono-csharp >= 0.96
+BuildRequires:	mono-csharp >= 1.1.6
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(monoautodeps)
 BuildRequires:	zlib-devel
-%{!?with_gstreamer:BuildRequires:	xine-lib-devel >= 1.0.0}
-Requires(post):	GConf2 >= 2.3.0
-Requires(post):	scrollkeeper
+%if %{with gstreamer}
+BuildRequires:	gstreamer-devel >= %{min_ver}
+BuildRequires:	gstreamer-GConf-devel >= %{min_ver}
+BuildRequires:	gstreamer-plugins-devel >= %{min_ver}
+%else
+BuildRequires:	xine-lib-devel >= 1.0.0
+%endif
+Requires(post,preun):	GConf2 >= 2.3.0
+Requires(post,preun):	scrollkeeper
 %if %{with gstreamer}
 Requires:	gstreamer-audio-effects >= %{min_ver}
 Requires:	gstreamer-audio-formats >= %{min_ver}
 Requires:	gstreamer-audiosink
 Requires:	gstreamer-gnomevfs >= %{min_ver}
-# videobalance plugin is required!
-Requires:	gstreamer-video-effects >= %{min_ver}
+%else
+Requires:	xine-plugin-audio
 %endif
-%{!?with_gstreamer:Requires:	xine-plugin-audio}
 # TODO: recheck alpha
 ExcludeArch:	%{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,6 +72,31 @@
 łatwiejszym i bardziej komfortowym  w użyciu niż programy oparte
 na wzorze iTunes jak Rhythmbox i Jamboree.
 
+%package plugin-dashboard
+Summary:	Dashboard plugin for Muine
+Summary(pl):	Wtyczka dashboard dla Muine
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	dashboard
+
+%description plugin-dashboard
+Simple dashboard plugin for Muine.
+
+%description -l pl plugin-dashboard
+Prosta wtyczka dashboard dla Muine.
+
+%package plugin-trayicon
+Summary:	Trayicon plugin for Muine
+Summary(pl):	Wtyczka obszaru powiadamiania dla Muine
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-trayicon
+Trayicon plugin for Muine.
+
+%description -l pl plugin-trayicon
+Wtyczka obszaru powiadamiania dla Muine.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -81,9 +106,8 @@
 mv po/{no,nb}.po
 
 %build
-cp /usr/share/automake/mkinstalldirs .
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -97,39 +121,47 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/muine/plugins
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-%find_lang %{name} --with-gnome --all-name
+install plugins/*.{dll,png,xml} \
+	$RPM_BUILD_ROOT%{_libdir}/muine/plugins
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/muine/*.la
 
+%find_lang %{name} --with-gnome --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install
-/usr/bin/scrollkeeper-update
+%gconf_schema_install muine.schemas
+%scrollkeeper_update_post
 %if %{with gstreamer}
-echo
-echo "Remember to install appropriate gstreamer plugins for files"
-echo "you want to play:"
-echo "- gstreamer-flac (for FLAC)"
-echo "- gstreamer-mad (for MP3s)"
-echo "- gstreamer-vorbis (for Ogg Vorbis)"
-echo
+%banner %{name} -e << EOF
+Remember to install appropriate GStreamer plugins for files
+you want to play:
+- gstreamer-flac (for FLAC)
+- gstreamer-mad (for MP3s)
+- gstreamer-vorbis (for Ogg Vorbis)
+EOF
 %else
-echo
-echo "Remember to install appropriate xine-decode plugins for files"
-echo "you want to play:"
-echo "- xine-decode-flac (for FLAC)"
-echo "- xine-decode-ogg (for Ogg Vorbis)"
-echo
+%banner %{name} -e << EOF
+Remember to install appropriate xine-decode plugins for files
+you want to play:
+- xine-decode-flac (for FLAC)
+- xine-decode-ogg (for Ogg Vorbis)
+EOF
 %endif
 
-%postun -p /usr/bin/scrollkeeper-update
+%preun
+%gconf_schema_uninstall muine.schemas
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -137,7 +169,9 @@
 %{_sysconfdir}/gconf/schemas/*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/muine
-%attr(755,root,root) %{_libdir}/muine/*
+%dir %{_libdir}/muine/plugins
+%attr(755,root,root) %{_libdir}/muine/libmuine.*
+%attr(755,root,root) %{_libdir}/muine/muine.*
 %{_libdir}/dbus-1.0/services/*
 %{_libdir}/mono/gac/*
 %{_libdir}/mono/muine
@@ -146,142 +180,60 @@
 %{_pixmapsdir}/*.png
 %{_pkgconfigdir}/*
 
+%files plugin-dashboard
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/muine/plugins/DashboardPlugin.dll
+
+%files plugin-trayicon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/muine/plugins/TrayIcon.dll
+%{_libdir}/muine/plugins/TrayIcon.xml
+%{_libdir}/muine/plugins/muine-tray-*.png
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/08/15 16:54:34  wolf
+- merged from DEVEL
+
 Revision 1.37  2005/08/15 13:22:26  wolf
 - 0.8.3
 
-Revision 1.36  2005/05/11 17:05:48  qboosh
-- use x8664 macro
-
-Revision 1.35  2005/03/14 14:06:13  havner
-- rel up for new flac
-
-Revision 1.34  2004/11/27 18:52:08  saq
-- massive attack: add missing gtk+2-devel epoch in BR
-
-Revision 1.33  2004/10/28 10:49:17  paladine
-- "MP3" unification
-
-Revision 1.32  2004/09/25 10:51:43  havner
-- excludearch alpha amd64 (no mono.pc)
-- rel 3
-
-Revision 1.31  2004/09/22 19:51:54  paladine
-- desktop fix
-- rel. 2
-
-Revision 1.30  2004/09/15 18:24:38  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
-  %%{__aclocal} args and BR: gnome-common >= 2.8.0
-
-Revision 1.29  2004/08/22 15:54:41  krzak
-- BuildRequires:  libgnome-devel
-
-Revision 1.28  2004/08/15 19:07:00  krzak
-- mono-csharp already require mono-devel
-
-Revision 1.27  2004/06/20 16:32:09  aflinta
-- up to version 0.6.3
-
-Revision 1.26  2004/06/07 06:29:30  aflinta
-- up to version 0.6.2
-
-Revision 1.25  2004/05/10 18:53:54  grzegol
-- updated to 0.6.1
-
-Revision 1.24  2004/05/06 21:25:21  aflinta
-- release 1, STBR for Ac, build problem is probably related to nptl'ed glibc
-
-Revision 1.23  2004/05/06 20:44:57  aflinta
-- builds fine for me, release 0.9, missing BR's?
-
-Revision 1.22  2004/05/06 18:19:59  freetz
-- BRs/Rs updated, won't build - mono related problems, still NFY
-
-Revision 1.21  2004/05/06 17:29:05  freetz
-- 0.6.0, work in progress NFY
-  note: kudos to Artur Flinta for helping me with pl translation
-  included in this release!
-
-Revision 1.20  2004/04/10 11:37:36  grzegol
-- updated to 0.5.3
-
-Revision 1.19  2004/04/07 22:43:52  grzegol
-- updated to 0.5.2
-
-Revision 1.18  2004/04/03 22:27:07  freetz
-- removed bogus desktop patch
-
-Revision 1.17  2004/04/03 21:34:38  grzegol
-- added locale-names patch (rename locale no -> nb)
-- fixed with_gstreamer bcond
-- updated BRs
-
-Revision 1.16  2004/04/03 21:09:15  freetz
-- changelog typo
-
-Revision 1.15  2004/04/03 21:05:47  freetz
-- gstreamer backend requires videobalance plugin (!)
-- dekstop patch added (pl, categories)
-- cosmetics
-- tested, rel.1 (IMHO works better with xine, so don't waste your time to
-  build it with gstreamer), what about STBR for AC ;)
-
-Revision 1.14  2004/04/03 19:34:22  freetz
-- 0.5.1
-- xine introduced as default backend (gstreamer bconded)
-- post-install msgs fixes
-- fixes bogus locale entries in %%files (blame krzak about it)
-- more BRs/Rs
-- NFY (work in progress - for now only xine backend tested)
-
-Revision 1.13  2004/03/01 18:22:54  krzak
-- refetch sources
-
-Revision 1.12  2004/02/27 23:27:25  krzak
-- up to 0.5.0
-- locales added
-
-Revision 1.11  2004/02/27 09:20:13  wiget
-- updated URLs
-- release 2
-
-Revision 1.10  2004/02/11 23:20:31  freetz
-- up to 0.4.0
-
-Revision 1.9  2004/02/03 19:31:06  freetz
-- 0.3.2
+Revision 1.34.2.11  2005/05/22 00:01:43  paladine
+- missing BR: dotnet-dbus-sharp-devel
+- sorted BRs/Rs
 
-Revision 1.8  2004/02/02 22:30:48  freetz
-- 0.3.1.1
+Revision 1.34.2.10  2005/05/15 22:28:13  freetz
+- package all libmuine*
 
-Revision 1.7  2004/02/01 12:57:00  freetz
-- 0.3.1
+Revision 1.34.2.9  2005/05/15 21:56:55  freetz
+- it works pretty well with both audio frontends, rel.1
+  added omited note about %%banner support
 
-Revision 1.6  2004/01/28 12:07:37  freetz
-- 0.3.0
+Revision 1.34.2.8  2005/05/15 21:51:44  freetz
+- plugin subpackages added, %%banner support
 
-Revision 1.5  2004/01/27 19:15:03  freetz
-- 0.3.0-pre1, switched to tarball from homepage
-- %%files updated
-  small note: builds/works/even plays music :)
+Revision 1.34.2.7  2005/05/14 23:34:56  freetz
+- TODO added, more BRs cleanup
 
-Revision 1.4  2004/01/27 14:12:09  freetz
-- removed "try to not debug by freetz" stuff - it causes runtime troubles
-- rel. point 2
+Revision 1.34.2.6  2005/05/14 23:12:45  freetz
+- R: dotnet-dbus-sharp
 
-Revision 1.3  2004/01/27 12:45:09  freetz
-- pl desc typo
+Revision 1.34.2.5  2005/05/14 23:00:09  freetz
+- merged arch magic from head
 
-Revision 1.2  2004/01/27 12:42:29  freetz
-- cosmetics: spaces -> tabs
+Revision 1.34.2.4  2005/05/14 22:55:48  freetz
+- cleaned up BRs
 
-Revision 1.1  2004/01/27 12:38:07  freetz
-- initial PLD release (use at own risk ;)
+Revision 1.34.2.3  2005/05/14 22:41:56  freetz
+- updated BRs, new style macros
 
+Revision 1.34.2.2  2005/05/06 11:37:25  wiget
+- 0.8.3 (gstreamer backend still broken)
+ 
+Revision 1.34.2.1  2004/12/28 14:13:52  krzak
+- up to 0.7.1
+- need mono 2.0 series packages
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/muine.spec?r1=1.37&r2=1.38&f=u




More information about the pld-cvs-commit mailing list