-Summary: DILLO - The GTK Web Browser
-Summary(pl): DILLO - przegl±darka web
+# TODO gettext support
+Summary: DILLO - The GTK+ Web Browser
+Summary(pl.UTF-8): DILLO - przeglądarka WWW
Name: dillo
-Version: 0.6.6
-Release: 5
+Version: 0.8.6
+Release: 1
License: GPL
Group: X11/Applications/Networking
-Source0: http://dillo.cipsga.org.br/download/%{name}-%{version}.tar.gz
+Source0: http://www.dillo.org/download/%{name}-%{version}.tar.bz2
+# Source0-md5: b65233d368bbd265a55effcf2c17f84b
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-gzip_fallback.patch
-Patch1: http://matzar.republika.pl/stuff/%{name}-gettext.patch.gz
-Patch2: http://bobuk.ipost.ru/packages/dillo/files/%{name}-%{version}-charset.patch
-Patch3: %{name}-encodings.patch
-Patch4: %{name}-localedir.patch
-URL: http://dillo.cipsga.org.br/
+Patch1: %{name}-0.7.0-alt-asp-charset-encodings-sysconfdir.patch
+URL: http://www.dillo.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gtk+-devel >= 1.2.0
BuildRequires: libjpeg-devel
-Buildrequires: libpng-devel >= 1.0.9
+BuildRequires: libpng-devel >= 1.0.9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _prefix /usr/X11R6
+%define _sysconfdir /etc/dillo
%description
-Dillo is small, fast, based on GTK+ library web browser written in C.
+Dillo is a small GTK+ based (GNOME is NOT required!) web browser.
+Dillo aims to be a multi-platform browser alternative that's small,
+stable, developer-friendly, usable, fast, and extensible.
-%description -l pl
-Dillo jest ma³±, szybk±, bazuj±c± na bibliotece GTK+ przegl±dark±
-sieci.
+%description -l pl.UTF-8
+Dillo jest małą, opartą na bibliotece GTK+ (GNOME nie jest wymagany)
+przeglądarką WWW. Dillo ma być wieloplatformową alternatywną
+przeglądarką, która jest mała, stabilna, przyjazna dla developerów,
+użyteczna, szybka i rozszerzalna.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
-rm -f missing
%{__aclocal}
%{__autoconf}
%{__automake}
-%configure --enable-cookies
-
+%configure \
+ --enable-cookies \
+ --enable-ipv6 \
+ --disable-dlgui
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/WWW,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_sysconfdir}}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/WWW
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install encodings $RPM_BUILD_ROOT%{_sysconfdir}
-%find_lang %{name}
+#%%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{name}.lang
+#%%files -f %{name}.lang
+%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog dillorc encodings doc/{*.txt,README}
-%attr(755,root,root) %{_bindir}/dillo
-%{_applnkdir}/Network/WWW/*
+%attr(755,root,root) %{_bindir}/*
+%{_desktopdir}/*.desktop
%{_pixmapsdir}/*
+%dir %{_libdir}/dillo
+%attr(755,root,root) %{_libdir}/dillo/*
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*