|
@@ -1,7 +1,7 @@
|
|
|
Summary: A lightweight GTK+ web browser
|
|
|
Summary(ja): 軽量な GTK+ ウェブブラウザ
|
|
|
Name: midori
|
|
|
-Version: 0.5.5
|
|
|
+Version: 0.5.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: Applications/Internet
|
|
@@ -10,7 +10,6 @@ URL: http://twotoasts.de/index.php/midori/
|
|
|
|
|
|
Source0: http://software.twotoasts.de/media/%{name}/%{name}_%{version}_all_.tar.bz2
|
|
|
#Patch0: %{name}-0.2.9-docdir.patch
|
|
|
-#Patch0: fix_desktop_entry.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
@@ -21,12 +20,6 @@ BuildRequires: libtool
|
|
|
BuildRequires: libxml2-devel >= 2.6
|
|
|
BuildRequires: perl-XML-Parser
|
|
|
|
|
|
-#%if %{?_dist_release} == "vl6"
|
|
|
-#BuildRequires: WebKit-gtk-devel >= 1.1.17
|
|
|
-#BuildRequires: gtk2-devel >= 2.10.0
|
|
|
-## for Single instance
|
|
|
-#BuildRequires: unique-devel >= 0.9
|
|
|
-
|
|
|
BuildRequires: WebKit3-gtk-devel
|
|
|
BuildRequires: gtk3-devel >= 3.0.0
|
|
|
BuildRequires: unique3-devel >= 0.9
|
|
@@ -52,7 +45,14 @@ BuildRequires: libXScrnSaver-devel
|
|
|
BuildRequires: vala-devel >= 0.14
|
|
|
BuildRequires: gcr-devel
|
|
|
|
|
|
-Requires: WebKit-gtk
|
|
|
+BuildRequires: cmake
|
|
|
+BuildRequires: WebKit-gtk-devel
|
|
|
+BuildRequires: zeitgeist-devel
|
|
|
+BuildRequires: zeitgeist-vala
|
|
|
+BuildRequires: gobject-introspection-devel
|
|
|
+
|
|
|
+Requires: WebKit-gtk
|
|
|
+Obsoletes: midori-devel
|
|
|
|
|
|
%description
|
|
|
Midori is a lightweight web browser, and has many features expected of a
|
|
@@ -84,58 +84,55 @@ Midori は軽量な Web ブラウザで、多くの機能がモダンブラウ
|
|
|
プロジェクトは現在初期アルファの状態にあります。
|
|
|
機能はまだ実装中で、一部はかなり不完全です。
|
|
|
|
|
|
-%package devel
|
|
|
-Summary: Development files for %{name}
|
|
|
-Summary(ja): %{name} の開発ファイル
|
|
|
-Group: Development/Libraries
|
|
|
-Requires: %{name} = %{version}-%{release}
|
|
|
-Requires: vala
|
|
|
+#%package devel
|
|
|
+#Summary: Development files for %{name}
|
|
|
+#Summary(ja): %{name} の開発ファイル
|
|
|
+#Group: Development/Libraries
|
|
|
+#Requires: %{name} = %{version}-%{release}
|
|
|
+#Requires: vala
|
|
|
|
|
|
-%description devel
|
|
|
-The %{name}-devel package contains libraries and header files for
|
|
|
-developing extensions for %{name}.
|
|
|
+#%description devel
|
|
|
+#The %{name}-devel package contains libraries and header files for
|
|
|
+#developing extensions for %{name}.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-#%patch0 -p1 -b .docdir
|
|
|
-#%patch0 -p1
|
|
|
sed -i '18,32d' data/midori.desktop.in
|
|
|
|
|
|
%build
|
|
|
-export CFLAGS="%{optflags}"
|
|
|
-./waf --prefix=%{_usr} \
|
|
|
- --docdir=%{_docdir}/%{name}-%{version} \
|
|
|
- --libdir=%{_libdir} \
|
|
|
- --enable-apidocs \
|
|
|
- --disable-zeitgeist \
|
|
|
- configure --enable-gtk3
|
|
|
-./waf %{?_smp_mflags} build
|
|
|
+%cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc -DUSE_APIDOCS=1 -DUSE_ZEITGEIST=OFF .
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
rm -rf %{buildroot}
|
|
|
-./waf --destdir=%{buildroot} install
|
|
|
+make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+
|
|
|
%find_lang %{name}
|
|
|
desktop-file-install \
|
|
|
--vendor "" \
|
|
|
--delete-original \
|
|
|
--dir %{buildroot}%{_datadir}/applications \
|
|
|
%{buildroot}%{_datadir}/applications/%{name}.desktop
|
|
|
-
|
|
|
-#mkdir -p %{buildroot}%{_datadir}/gtk-doc/html/%{name}
|
|
|
-#install -Dpm 644 _build_/docs/api/midori/html/* \
|
|
|
-# %{buildroot}%{_datadir}/gtk-doc/html/%{name}
|
|
|
+
|
|
|
+desktop-file-install \
|
|
|
+ --delete-original \
|
|
|
+ --remove-not-show-in=Pantheon \
|
|
|
+ --dir %{buildroot}%{_datadir}/applications \
|
|
|
+ %{buildroot}%{_datadir}/applications/%{name}-private.desktop
|
|
|
|
|
|
%clean
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
%post
|
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
+/usr/bin/update-desktop-database &> /dev/null || :
|
|
|
|
|
|
|
|
|
%postun
|
|
|
if [ $1 -eq 0 ] ; then
|
|
|
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
|
|
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
+ /usr/bin/update-desktop-database &> /dev/null || :
|
|
|
fi
|
|
|
|
|
|
%posttrans
|
|
@@ -143,21 +140,28 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root,-)
|
|
|
-%doc %{_docdir}/%{name}-%{version}/
|
|
|
+%doc %{_docdir}/%{name}/*
|
|
|
%{_bindir}/midori
|
|
|
+%{_datadir}/appdata/%{name}.appdata.xml
|
|
|
%{_datadir}/applications/%{name}*.desktop
|
|
|
+%{_datadir}/gtk-doc/html/*
|
|
|
%{_datadir}/icons/hicolor/*
|
|
|
%{_datadir}/%{name}/
|
|
|
%{_libdir}/%{name}/
|
|
|
+%{_libdir}/lib%{name}*
|
|
|
%{_sysconfdir}/xdg/%{name}/
|
|
|
|
|
|
-%files devel
|
|
|
-%defattr(-,root,root,-)
|
|
|
-#%doc %{_datadir}/gtk-doc/
|
|
|
-%{_datadir}/vala/
|
|
|
-%{_includedir}/%{name}-0.5/
|
|
|
+#%files devel
|
|
|
+#%defattr(-,root,root,-)
|
|
|
+#%{_datadir}/vala/
|
|
|
+#%{_includedir}/%{name}-0.5/
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 23 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.6-1
|
|
|
+- new upstream release
|
|
|
+- added BuildRequires: cmake
|
|
|
+- added Obsoletes: midori-devel
|
|
|
+
|
|
|
* Sat Aug 31 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.5.5-1
|
|
|
- new upstream release
|
|
|
|