diff --git a/midori.spec b/midori.spec index bb46101..ae8d258 100644 --- a/midori.spec +++ b/midori.spec @@ -1,7 +1,7 @@ %define majver %(echo %version|cut -d. -f1-2) Name: midori Version: 9.0 -Release: 2mamba +Release: 3mamba Summary: A lightweight web browser Group: Graphical Desktop/Applications/Internet Vendor: openmamba @@ -15,26 +15,24 @@ Patch1: midori-0.5.0-openmamba_homepage.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: gtk-doc +BuildRequires: gobject-introspection-devel +BuildRequires: ldconfig +BuildRequires: libX11-devel +BuildRequires: libarchive-devel BuildRequires: libatk-devel BuildRequires: libcairo-devel -BuildRequires: libdbus-devel -BuildRequires: libdbus-glib-devel -BuildRequires: libfontconfig-devel -BuildRequires: libfreetype-devel +BuildRequires: libgcr-devel BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgtk-devel -BuildRequires: libnotify-devel +BuildRequires: libharfbuzz-devel +BuildRequires: libjson-glib-devel +BuildRequires: libp11-kit-devel BuildRequires: libpango-devel -BuildRequires: libpng-devel +BuildRequires: libpeas-devel BuildRequires: libsoup-devel BuildRequires: libsqlite-devel -BuildRequires: libunique-devel -BuildRequires: libwebkit-gtk-devel -BuildRequires: libX11-devel -BuildRequires: libxml2-devel -BuildRequires: libXScrnSaver-devel +BuildRequires: libwebkit2gtk-devel ## AUTOBUILDREQ-END BuildRequires: desktop-file-utils BuildRequires: gettext @@ -46,14 +44,13 @@ BuildRequires: libsexy-devel BuildRequires: librsvg BuildRequires: libtool BuildRequires: perl(XML::Parser) -BuildRequires: python-docutils +#BuildRequires: python-docutils BuildRequires: vala BuildRequires: vala-tools BuildRequires: libzeitgeist-devel BuildRequires: libgranite-devel BuildRequires: libpeas-devel Requires: ca-certificates -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Midori is a lightweight web browser. @@ -94,12 +91,12 @@ This package contains %{name} API documentation. #%patch1 -p1 for w in $(find . -name "wscript*"); do - sed -i 's|#!/usr/bin/python|#!%{__python36}|' $w - sed -i 's|#!/usr/bin/env python|#!%{__python36}|' $w - sed -i 's|#! /usr/bin/env python|#!%{__python36}|' $w - sed -i 's|#!python|#!%{__python36}|' $w - sed -i 's|#!/usr/local/bin/python2.1|#!%{__python36}|' $w - sed -i 's|#!/usr/local/bin/python|#!%{__python36}|' $w + sed -i 's|#!/usr/bin/python|#!%{__python3}|' $w + sed -i 's|#!/usr/bin/env python|#!%{__python3}|' $w + sed -i 's|#! /usr/bin/env python|#!%{__python3}|' $w + sed -i 's|#!python|#!%{__python3}|' $w + sed -i 's|#!/usr/local/bin/python2.1|#!%{__python3}|' $w + sed -i 's|#!/usr/local/bin/python|#!%{__python3}|' $w done #sed -i 's|#! /usr/bin/env python|#!%{__python36}|' tools/check-style @@ -108,30 +105,11 @@ done %cmake -d build \ -DCMAKE_C_FLAGS="-lm -lX11 %{optflags}" -#./configure \ -# --prefix=%{_prefix} \ -# --enable-gtk3 \ -# --enable-granite \ -# --enable-apidocs - %make -#./waf \ -# --prefix=%{_prefix} \ -# --docdir=%{_docdir}/%{name}-%{version} \ -# --libdir=%{_libdir} \ -# --enable-apidocs \ -# configure -# -#./waf %{?_smp_mflags} build - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -C build -#./waf --destdir=%{buildroot} install - -#mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/midori -#install -pm 644 _build/docs/api/midori/html/* %{buildroot}%{_datadir}/gtk-doc/html/midori %find_lang %{name} @@ -152,8 +130,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root) -#%{_sysconfdir}/xdg/midori/extensions/adblock/config -#%{_sysconfdir}/xdg/midori/search %{_bindir}/midori %{_libdir}/libmidori-core.so %{_libdir}/libmidori-core.so.* @@ -168,20 +144,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/*/*.svg %doc COPYING -#%files devel -#%defattr(-,root,root) -#%{_includedir}/midori-%{majver}/extensions/*.h -#%{_datadir}/vala/vapi/*.deps -#%{_datadir}/vala/vapi/*.vapi - %files apidocs %defattr(-,root,root) %dir %{_docdir}/midori %{_docdir}/midori/* -#%{_datadir}/gtk-doc/html/midori/* -#%doc ChangeLog README TODO %changelog +* Sat Oct 03 2020 Silvan Calarco 9.0-3mamba +- rebuilt + * Wed Jul 22 2020 Silvan Calarco 9.0-2mamba - rebuilt