[mumble] Upgrade to 1.2.3-2

Andreas Osowski th0br0 at fedoraproject.org
Tue May 17 21:22:02 UTC 2011 

commit 192f9136846c95584144654dbcf62afa61f1f69c
Author: Andreas Osowski <th0br0 at mkdir.name>
Date:   Tue May 17 23:21:28 2011 +0200

    Upgrade to 1.2.3-2
    
    * Tue May 17 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-2
    - Added celt071 functionality
    - Fixed the qmake args
    
    * Wed Mar 30 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-1
    - Update to 1.2.3
    - Fixes vulnerability #610845
    - Added patch to make it compile with Ice 3.4.0
    - Added tmpfile.d config file for murmur

 .gitignore                   |    1 +
 mumble-1.2.3-slice2cpp.patch |   12 +++++++++
 mumble.spec                  |   54 +++++++++++++++++++++++++++++++++--------
 murmur-tmpfiles.conf         |    1 +
 sources                      |    2 +-
 5 files changed, 58 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 442308b..69bc763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mumble-1.2.2.tar.gz
+/mumble-1.2.3.tar.gz
diff --git a/mumble-1.2.3-slice2cpp.patch b/mumble-1.2.3-slice2cpp.patch
new file mode 100644
index 0000000..1979b7d
--- /dev/null
+++ b/mumble-1.2.3-slice2cpp.patch
@@ -0,0 +1,12 @@
+diff -aur mumble-1.2.3.orig/src/murmur/murmur.pro mumble-1.2.3/src/murmur/murmur.pro
+--- mumble-1.2.3.orig/src/murmur/murmur.pro	2011-02-19 22:35:19.000000000 +0100
++++ mumble-1.2.3/src/murmur/murmur.pro	2011-03-30 19:29:46.614774630 +0200
+@@ -69,7 +69,7 @@
+ 	win32 {
+ 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice
+ 	} else {
+-		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.0/slice/ Murmur.ice
+ 	}
+ 
+ 	slice.depends = Murmur.ice
diff --git a/mumble.spec b/mumble.spec
index 1522781..b674ba7 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -1,6 +1,6 @@
 Name:		mumble
-Version:	1.2.2
-Release:	11%{?dist}
+Version:	1.2.3
+Release:	2%{?dist}
 Summary:	Voice chat suite aimed at gamers
 
 Group:		Applications/Internet
@@ -11,6 +11,8 @@ Source1:	murmur.init
 Source2:	%{name}.desktop
 Source3:	%{name}11x.desktop
 Source4:	%{name}-overlay.desktop
+Source5:	murmur-tmpfiles.conf
+Patch0:		%{name}-%{version}-slice2cpp.patch
 #fixes compile error on f10 and above
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,6 +25,7 @@ BuildRequires:	desktop-file-utils, openssl-devel
 BuildRequires:	libXevie-devel, celt-devel
 BuildRequires:	protobuf-compiler, avahi-compat-libdns_sd-devel
 BuildRequires:	libsndfile-devel, protobuf-devel
+Requires:	celt071
 
 # Due to missing ice on ppc64
 ExcludeArch: ppc64
@@ -41,8 +44,8 @@ Provides:	%{name}-server = %{version}-%{release}
 
 Requires(pre): shadow-utils
 Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
-Requires(postun): initscripts
+Requires(preun): chkconfig
+Requires: initscripts
 
 %description -n murmur
 Murmur(also called mumble-server) is part of the VoIP suite Mumble
@@ -88,15 +91,16 @@ exit 0
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{_qt4_qmake} "CONFIG+=no-bundled-speex no-g15 \
 no-embed-qt-translations no-update \
-no-bundled-celt \
-QMAKE_CFLAGS_RELEASE=%{optflags} \
-QMAKE_CXXFLAGS_RELEASE=%{optflags} \
-DEFINES+=PLUGIN_PATH=%{_libdir}/%{name} \
-DEFINES+=DEFAULT_SOUNDSYSTEM=PulseAudio" main.pro
+no-bundled-celt" \
+QMAKE_CFLAGS_RELEASE="%{optflags}" \
+QMAKE_CXXFLAGS_RELEASE="%{optflags}" \
+DEFINES+="PLUGIN_PATH=%{_libdir}/%{name}" \
+DEFINES+="DEFAULT_SOUNDSYSTEM=PulseAudio" main.pro
 make 
 #%{?_smp_mflags}
 
@@ -127,6 +131,9 @@ ln -s libmumble.so.%{version} %{buildroot}%{_libdir}/%{name}/libmumble.so
 ln -s libmumble.so.%{version} %{buildroot}%{_libdir}/%{name}/libmumble.so.1
 ln -s libmumble.so.%{version} %{buildroot}%{_libdir}/%{name}/libmumble.so.1.2
 
+#symlink for celt071
+ln -s ../libcelt071.so.0.0.0 %{buildroot}%{_libdir}/%{name}/libcelt.so.0.7.0
+
 mkdir -p %{buildroot}%{_sysconfdir}/murmur/
 install -pD scripts/murmur.ini.system %{buildroot}%{_sysconfdir}/murmur/murmur.ini
 ln -s /etc/murmur/murmur.ini %{buildroot}%{_sysconfdir}/%{name}-server.ini
@@ -177,7 +184,14 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/mumble-server/
 mkdir -p %{buildroot}%{_localstatedir}/log/mumble-server/
 
 #pid dir
-mkdir -p %{buildroot}%{_localstatedir}/run/mumble-server/
+mkdir -p %{buildroot}%{_localstatedir}/run/
+install -d -m 0710 %{buildroot}%{_localstatedir}/run/mumble-server/
+
+%if 0%{?fedora} >= 15
+#tmpfiles.d
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%endif
 
 %post
 /sbin/ldconfig
@@ -231,6 +245,7 @@ fi
 #%{_datadir}/hal/fdi/policy/20thirdparty/11-input-mumble-policy.fdi
 %{_datadir}/%{name}/translations/%{name}_*.qm
 %{_datadir}/%{name}11x/translations/%{name}_*.qm
+%{_libdir}/%{name}/libcelt.so.0.7.0
 
 %files -n murmur
 %defattr(-,root,root,-)
@@ -247,7 +262,14 @@ fi
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/murmur.conf
 %dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/lib/mumble-server/
 %dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/log/mumble-server/
-%dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/run/mumble-server/
+%ghost %dir %{_localstatedir}/lib/mumble-server/
+%ghost %dir %{_localstatedir}/log/mumble-server/
+%if 0%{?fedora} >= 15
+%dir %{_localstatedir}/run/mumble-server/
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%else
+%ghost %dir %{_localstatedir}/run/mumble-server/
+%endif
 
 %files plugins
 %defattr(-,root,root,-)
@@ -264,6 +286,16 @@ fi
 %{_datadir}/kde4/services/mumble.protocol
 
 %changelog
+* Tue May 17 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-2
+- Added celt071 functionality
+- Fixed the qmake args
+
+* Wed Mar 30 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-1
+- Update to 1.2.3
+- Fixes vulnerability #610845
+- Added patch to make it compile with Ice 3.4.0
+- Added tmpfile.d config file for murmur
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/murmur-tmpfiles.conf b/murmur-tmpfiles.conf
new file mode 100644
index 0000000..b4aa7b3
--- /dev/null
+++ b/murmur-tmpfiles.conf
@@ -0,0 +1 @@
+D /var/run/mumble-server 0710 root mumble-server -
diff --git a/sources b/sources
index f2af029..66fef6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de30ee85170e183b66568b53b04c5727  mumble-1.2.2.tar.gz
+55804e3dfe98b16eeb40abca6c254625  mumble-1.2.3.tar.gz

More information about the scm-commits mailing list