Change backend library to openssl

Change-Id: Ifb79f52beed9afcda2c0dbd77ec89b33cece9634

diff --git a/meson.build b/meson.build
index 8d01f52..4feb280 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,7 @@ common_flags = [
   '-DG_LOG_DOMAIN="GLib-Net"',
   '-DLOCALE_DIR="@0@"'.format(localedir),
   '-DG_DISABLE_DEPRECATED',
-  '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_56'
+  '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46'
 ]
 
 add_project_arguments(common_flags, language: 'c')
@@ -43,7 +43,7 @@ if host_system.contains('linux')
 endif
 
 # *** Check GLib GIO        ***
-glib_dep = dependency('glib-2.0', version: '>= 2.55.1',
+glib_dep = dependency('glib-2.0', version: '>= 2.46.0',
   fallback: ['glib', 'libglib_dep'])
 gio_dep = dependency('gio-2.0',
   fallback: ['glib', 'libgio_dep'])

diff --git a/packaging/glib-networking.spec b/packaging/glib-networking.spec
index 849c7fe..b4239fe 100755 (executable)
--- a/packaging/glib-networking.spec
+++ b/packaging/glib-networking.spec
@@ -12,9 +12,10 @@ Url:            http://www.gnome.org
 BuildRequires:  intltool
 BuildRequires:  which
 BuildRequires:  libgcrypt-devel
+BuildRequires:  meson
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.46.0
-BuildRequires:  pkgconfig(gnutls) >= 3.0
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  ca-certificates-devel
@@ -35,46 +36,20 @@ Currently, there is only a proxy module based on libproxy.
 cp %{SOURCE1001} .
 
 %build
-export CFLAGS='-Wformat-nonliteral -fstack-protector-strong -Wl,-z,relro -D_FORTIFY_SOURCE=2 -fPIE -pie'
-%autogen \
-    --disable-static \
-%if %{with libproxy}
-    --with-libproxy  \
-%endif
-    --enable-tizen-dlog \
-%if 0
-    --enable-tizen-gnutls-debug \
-%endif
-%if "{tizen_profile_name}" == "tv"
-    --enable-tizen-multiple-certificate=yes \
-    --enable-tizen-tv-update-default-priority \
-    --enable-tizen-performance-test-log \
-%endif
-%if "{tizen_profile_name}" == "tv"
-    --with-ca-certificates=%{TZ_SYS_RO_CA_CERTS} \
-%else
-    --with-ca-certificates=%{TZ_SYS_RO_CA_BUNDLE} \
-%endif
-
-%__make %{?_smp_mflags} V=1
+meson --prefix /usr/ build -Dstatic_modules=false -Dgnutls=disabled -Dopenssl=enabled
+ninja -C build all
 
 %install
-%if "{tizen_profile_name}" == "tv"
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{TZ_SYS_SHARE}/ca-certificates/
-cp wss.pem %{buildroot}%{TZ_SYS_SHARE}/ca-certificates/
-%endif
-%make_install
+export DESTDIR=%{buildroot}
+ninja -C build install
+
 %find_lang %{name}
 
 %files
 %manifest %{name}.manifest
 %defattr(-, root, root)
 %license COPYING
-%{_libdir}/gio/modules/libgiognutls.so
-%if "{tizen_profile_name}" == "tv"
-%{TZ_SYS_SHARE}/ca-certificates/wss.pem
-%endif
+%{_libdir}/gio/modules/libgioopenssl.so
 %if %{with libproxy}
 %{_libdir}/gio/modules/libgiolibproxy.so
 %{_libexecdir}/glib-pacrunner