- rel 2; missing changes

diff --git a/build.patch b/build.patch
index 625626dfb2a706bb9e59ba4cbc4096395adbdefe..6d87df04f342a4d68344e6bbefe71544fd212811 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -8,3 +8,34 @@
        m4/Makefile
        include/Makefile
        include/mediastreamer2/Makefile
+--- mediastreamer-2.16.1/configure.ac~ 2018-09-26 12:17:00.000000000 +0200
++++ mediastreamer-2.16.1/configure.ac  2018-09-26 12:53:27.045356783 +0200
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT([mediastreamer],[2.15.1])
++AC_INIT([mediastreamer],[2.16.1])
+ 
+ AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION         A mediastreaming library for telephony application.])
+ AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
+--- mediastreamer-2.16.1/src/Makefile.am~      2017-04-06 11:27:56.000000000 +0200
++++ mediastreamer-2.16.1/src/Makefile.am       2018-09-26 12:58:10.680232083 +0200
+@@ -467,7 +467,7 @@ endif
+ 
+ AM_OBJCFLAGS=$(AM_CFLAGS)
+ 
+-imgdir=$(datadir)/images/
++imgdir=$(datadir)/pixmaps/
+ 
+ img_DATA=voip/nowebcamCIF.jpg
+ 
+--- mediastreamer-2.16.1/src/base/msfactory.c~ 2017-07-20 15:56:05.000000000 +0200
++++ mediastreamer-2.16.1/src/base/msfactory.c  2018-09-26 13:00:39.631224915 +0200
+@@ -231,7 +231,7 @@ void ms_factory_init(MSFactory *obj){
+       ms_message("ms_factory_init() done: platform_tags=%s", tags);
+       ms_free(tags);
+       obj->echo_canceller_filtername = ms_strdup("MSWebRTCAECM");
+-      obj->image_resources_dir = bctbx_strdup_printf("%s/images", PACKAGE_DATA_DIR);
++      obj->image_resources_dir = bctbx_strdup_printf("/usr/share/pixmaps");
+ }
+ 
+ 

diff --git a/mediastreamer.spec b/mediastreamer.spec
index 8ae4089b03777f7ab1aa52dbaad12c6cf88df614..9a02f14b3c08b5f9f63217379eca507ce3de289f 100644 (file)
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -20,7 +20,7 @@ Summary:      Audio/Video real-time streaming
 Summary(pl.UTF-8):     Przesyłanie strumieni audio/video w czasie rzeczywistym 
 Name:          mediastreamer
 Version:       2.16.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Libraries
 Source0:       https://linphone.org/releases/sources//mediastreamer/%{name}-%{version}.tar.gz
@@ -194,17 +194,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README.md
 %attr(755,root,root) %{_bindir}/mediastream
 %attr(755,root,root) %{_bindir}/msaudiocmp
 %{?with_pcap:%attr(755,root,root) %{_bindir}/pcap_playback}
 %attr(755,root,root) %{_libdir}/libmediastreamer_base.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_base.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_base.so.10
 %attr(755,root,root) %{_libdir}/libmediastreamer_voip.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_voip.so.6
+%attr(755,root,root) %ghost %{_libdir}/libmediastreamer_voip.so.10
 %dir %{_libdir}/mediastreamer
 %dir %{_libdir}/mediastreamer/plugins
-%{_pixmapsdir}/%{name}
+%{_pixmapsdir}/*.jpg
 
 %files devel
 %defattr(644,root,root,755)