diff --git a/mumble-1.3.0-rc2.tar.gz b/mumble-1.3.0-rc2.tar.gz deleted file mode 100644 index f6eb506..0000000 --- a/mumble-1.3.0-rc2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:258643a73997dc192ec9cc1175a55082e432ae21e4283bef27ffa331e85a0380 -size 8759830 diff --git a/mumble-1.3.0-rc2.tar.gz.sig b/mumble-1.3.0-rc2.tar.gz.sig deleted file mode 100644 index dbcb1b8..0000000 --- a/mumble-1.3.0-rc2.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJdEpIPAAoJEFuM+Hu4k0Sbo3oQAKdvMy7k0LyNkdQBkk9kRWVq -p2nfokR7YBQpcpdmpMIOGTwf7NPvaRF8KncuwP/aSUmD7pQshsugaVufOFp++e9q -zeZY4cnIZ3OP9lZYRYEqH58Wh+STaVtmshwgqoU5V6OzoIXZRD4jTWc3n1lqawRb -0Bvqk907hC7vsxCKQVxBziL1GWa/mtkWSxv9zDfzT9lPH/3/UouY6qLdbAJUTGM+ -DuvhcvnNDWNeKlkSOStGqu37INpT6IfIhIr0AG7QH+3XyH/ai1Gr4r2A5CjmTYZ5 -xpzVfM+U/0blLjAcRFs4/z1c9epTOKtZGKlZHEX2+uhuWyvOUr3MjRtz0Akx4W0q -55nVTnu8Waqse2vUWoSyr2egEXgdvYutH+lXJGCdOVnMnVLAEbbpRASViEAFYIy4 -xEZ3nf5AZch1iLCLM1zmnYb8+o9vnH/2tzQ9cU6Q0CApfEj4Iq4bMBKP73pid8fX -LQopFUfBfCQVq+I23U7ZdwK+zmVE7TKtx3XW5if6JkyqEcX6mcIMZ62PubDt3FOA -/F9EP+TlvxzX2Wdz3cTi/LUfBNU69UyTmwGczPT36go2NAnRA0Alns4197sP75v+ -63KDcv3ywex+Mdzg8A9/dVHOm8Ev3Uaj1zEviQcIzQuFu7t2JWM8kdLF9/7Ys4ie -s7BWefZ/gJLwbxh61i/Z -=1ZOP ------END PGP SIGNATURE----- diff --git a/mumble-1.3.0.tar.gz b/mumble-1.3.0.tar.gz new file mode 100644 index 0000000..1149e91 --- /dev/null +++ b/mumble-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a8de2547344962a81c00c37b5d8bd5a371bb685fa36cf03a3f134e37c79b80d +size 8788587 diff --git a/mumble-1.3.0.tar.gz.sig b/mumble-1.3.0.tar.gz.sig new file mode 100644 index 0000000..b032d8c --- /dev/null +++ b/mumble-1.3.0.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJddAmIAAoJEFuM+Hu4k0SbdioP/jUb+0ZAmDzhg5LHkuMw/M65 +F/Bh6ev715tKoAu9691Lg9KS8qic1mygJYH7T9HRwvvxfoO35mpsYe8pOzlxk3GY +4EF1xII9thLA9cb8Vsh3zWoq9dygeGw8DIvsfecTe2dE7qVQnGJR6lyOvc+KDz3O +XTxAx9J0JeMZTR6NfS2/vHwAlDoxTxhzRHV3+y8KMSaSFw0LRLP2UvaFBWLWTYFm +IvVJcTPSzKGWSU5Uqay8usHyXtKZugwAXw+1zKgXAZ3dR1w1tPAYPTjnEYIgFR+x +NPg7c3yksfN6K3TNj1Ska+9bXGI8KyYAcMGkaGLZKm/Pa5wgOmKAYBdoFMK0vMHm +3Iy/GUujEycch9C6OmpegElepDh5KaOqVX9CoNnbf+IjVCirGYDupdtEUPkCi6yb +kl1MuTQ9B+vPFQCU/iXvU3fTxts+jYYkC1cjfDTNvWR1FOvxTNQMaAwlqDCTQdvf +U0o/6JzTeTZhTmSDVdmnPkT6Pa9HQmtl6+/A/r3MmqgLZ3LyHiZjgH3HdBahJzPc +c+pRjvfuBqQ0B0qSDYbzE/Q7eG8Kyqs2O738XPrzt6c/5nikMhaDFCvFX6ClXBgV +lVjndjNdwjGUoWrYI8lU6GCdWGD8HLlTDrLuKyz0YH2FNbyG6wbR4W/H+jycEgZy +gwu5qAGxJJOC14glMhHy +=Uz2v +-----END PGP SIGNATURE----- diff --git a/mumble.changes b/mumble.changes index f9e71c1..419dbae 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Sep 10 17:33:25 UTC 2019 - Michal Suchanek + +- Update to upstream version 1.3.0 final. + Release notes at: + https://www.mumble.info/blog/mumble-1.3.0-release-announcement/ +- Use system speex and opus. + ------------------------------------------------------------------- Tue Sep 3 16:10:57 UTC 2019 - Michal Suchanek diff --git a/mumble.spec b/mumble.spec index 68d4857..32b1b78 100644 --- a/mumble.spec +++ b/mumble.spec @@ -16,7 +16,7 @@ # -%define snapshot rc2 +#%%define snapshot rc2 %define ver 1.3.0 %if 0%{?fedora_version} %bcond_without ice @@ -32,7 +32,8 @@ # incompatible to each other mumble bundles some specific # versions. %bcond_with system_celt -%bcond_without system_speex +%bcond_with system_opus +%bcond_with system_speex Name: mumble Version: %{ver}%{?snapshot:_%{snapshot}} Release: 0 @@ -71,6 +72,9 @@ BuildRequires: avahi-compat-libdns_sd-devel BuildRequires: libcelt-devel Requires: libcelt0 > 0.7.0 %endif +%if %{with system_opus} +BuildRequires: pkgconfig(opus) +%endif %if %{with system_speex} BuildRequires: speex-devel BuildRequires: pkgconfig(speexdsp) @@ -198,9 +202,10 @@ if [ ! -e %{_libexecdir}/qt4/translations/qt_de.qm ]; then sed -i -e '/qt_.*\.qm/d' src/mumble/mumble.qrc fi %endif -qmake \ +%qmake5 \ QMAKE_CFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \ QMAKE_CXXFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \ + QMAKE_LRELEASE="%{_bindir}/lrelease-qt5" \ DEFINES*=NO_UPDATE_CHECK \ DEFINES*=MUMBLE_VERSION=%{version} \ DEFINES*=PLUGIN_PATH=%{_libdir}/mumble/plugins \ @@ -216,6 +221,9 @@ qmake \ %if %{with system_celt} CONFIG*=no-bundled-celt \ %endif +%if %{with system_speex} + CONFIG*=no-bundled-opus \ +%endif %if %{with system_speex} CONFIG*=no-bundled-speex \ %endif