diff --git a/control-center.spec b/control-center.spec index f35f617..2a9e98c 100644 --- a/control-center.spec +++ b/control-center.spec @@ -143,19 +143,11 @@ utilities. %autosetup -S git -n gnome-control-center-%{version} %build -%configure \ - --disable-static \ - --disable-update-mimedb \ - CFLAGS="$RPM_OPT_FLAGS -Wno-error" - -# drop unneeded direct library deps with --as-needed -# libtool doesn't make this easy, so we do it the hard way -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - -make %{?_smp_mflags} V=1 +%meson +%meson_build %install -%make_install +%meson_install desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -169,9 +161,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/wm-properties rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/autostart rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/cursor-fonts -# remove useless libtool archive files -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \; - # remove rpath chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center @@ -215,6 +204,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center * Fri Feb 09 2018 Bastien Nocera - 3.27.90-1 + control-center-3.27.90-1 - Update to 3.27.90 +- Use meson to build * Wed Feb 07 2018 Fedora Release Engineering - 1:3.26.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild