packages: mumble/mumble.spec - QtSql-sqlite3 is actually needed by both mum...

[shadzik]

Author: shadzik                      Date: Thu Apr 15 16:46:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- QtSql-sqlite3 is actually needed by both mumble and murmur
- rel 0.2
- rearranged BRs
- murmur init script

---- Files affected:
packages/mumble:
   mumble.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/mumble/mumble.spec
diff -u packages/mumble/mumble.spec:1.14 packages/mumble/mumble.spec:1.15
--- packages/mumble/mumble.spec:1.14	Wed Apr  7 10:23:47 2010
+++ packages/mumble/mumble.spec	Thu Apr 15 18:46:22 2010
@@ -6,7 +6,7 @@
 Summary:	Voice chat software primarily intended for use while gaming
 Name:		mumble
 Version:	1.2.2
-Release:	0.1
+Release:	0.2
 License:	BSD and Custom (see LICENSE)
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/mumble/%{name}-%{version}.tar.gz
@@ -29,12 +29,14 @@
 BuildRequires:	QtXmlPatterns-devel >= %{qtver}
 BuildRequires:	celt-devel >= 0.7.1
 BuildRequires:	ice-devel
-BuildRequires:	protobuf-devel
+BuildRequires:	protobuf
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	speech-dispatcher-devel
 BuildRequires:	speex-devel
+Requires:	QtSql-sqlite3 >= %{qtver}
+Requires:	speech-dispatcher
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,7 +49,6 @@
 Summary:	Mumble voice chat server
 Group:		Applications/Communications
 Requires(post,preun):	/sbin/chkconfig
-Requires:	QtSql-sqlite3 >= %{qtver}
 Requires:	rc-scripts
 
 %description server
@@ -74,16 +75,18 @@
 
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_libdir}/%{name},%{_sysconfdir}/murmur,%{_desktopdir}}
 install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/{16x16,32x32,48x48,64x64}
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/murmurd
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install -p release/libmumble.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
 install -p release/mumble* $RPM_BUILD_ROOT%{_bindir}
 install -p release/murmurd $RPM_BUILD_ROOT%{_sbindir}
 install -p release/plugins/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 cp -a scripts/murmur.ini $RPM_BUILD_ROOT%{_sysconfdir}/murmur
-cp -a scripts/mumble.desktop $RPM_BUILD_ROOT%{_desktopdir}
 cp -a src/mumble11x/resources/mumble.16x16.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/16x16/%{name}.png
 cp -a src/mumble11x/resources/mumble.32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/%{name}.png
 cp -a src/mumble11x/resources/mumble.48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/%{name}.png
@@ -121,6 +124,7 @@
 %dir %{_sysconfdir}/murmur
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/murmur/murmur.ini
 %attr(755,root,root) %{_sbindir}/murmurd
+%attr(755,root,root) /etc/rc.d/init.d/murmurd
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -128,6 +132,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/15 16:46:22  shadzik
+- QtSql-sqlite3 is actually needed by both mumble and murmur
+- rel 0.2
+- rearranged BRs
+- murmur init script
+
 Revision 1.14  2010/04/07 08:23:47  shadzik
 - Ice-devel -> ice-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mumble/mumble.spec?r1=1.14&r2=1.15&f=u