rpms/midori/F-9 .cvsignore, 1.3, 1.4 midori.spec, 1.4, 1.5 sources, 1.3, 1.4
Peter Gordon
pgordon at fedoraproject.org
Mon Sep 8 18:33:10 UTC 2008
- Previous message (by thread): rpms/perl-Class-Method-Modifiers/devel import.log, NONE, 1.1 perl-Class-Method-Modifiers.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/docbook-utils/devel docbook2man-spec.pl, NONE, 1.1 docbook-utils.spec, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pgordon
Update of /cvs/pkgs/rpms/midori/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26209/F-9
Modified Files:
.cvsignore midori.spec sources
Log Message:
Update to 0.0.20; fix License tag; add icon cache scriptlets.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 25 May 2008 22:44:07 -0000 1.3
+++ .cvsignore 8 Sep 2008 18:32:40 -0000 1.4
@@ -1 +1 @@
-midori-0.0.18.tar.gz
+midori-0.0.20.tar.bz2
Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/midori.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- midori.spec 25 May 2008 22:44:07 -0000 1.4
+++ midori.spec 8 Sep 2008 18:32:40 -0000 1.5
@@ -1,29 +1,28 @@
-## Dependency: WebKit SVN 29723+
-## This is the EVR for its sufficient Fedora package.
-%global webkit_min_version 1.0.0-0.8.svn31787
-
Name: midori
-Version: 0.0.18
+Version: 0.0.20
Release: 1%{?dist}
Summary: A lightweight GTK+ web browser
Group: Applications/Internet
-License: LGPLv2.1+
+License: LGPLv2+
URL: http://software.twotoasts.de/?page=midori
-Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz
+Source0: http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: gtksourceview2-devel
+BuildRequires: intltool
BuildRequires: libsexy-devel
+BuildRequires: librsvg2
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: perl(XML::Parser)
-BuildRequires: WebKit-gtk-devel >= %{webkit_min_version}
-
-Requires: WebKit-gtk >= %{webkit_min_version}
+BuildRequires: unique-devel
+BuildRequires: waf
+BuildRequires: WebKit-gtk-devel
%description
Midori is a lightweight web browser, and has many features expected of a
@@ -42,17 +41,19 @@
%prep
%setup -q
-chmod a-x src/main.c
+## Use the system-provided waf, instead of the in-tarball copy.
+rm -rf waf
%build
-%configure
-make %{?_smp_mflags}
+export CFLAGS="%{optflags}"
+waf --prefix=%{_usr} configure
+waf %{?_smp_mflags} build
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+waf --destdir=%{buildroot} install
%find_lang %{name}
desktop-file-install \
--vendor fedora \
@@ -65,14 +66,39 @@
rm -rf %{buildroot}
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/midori
%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/icons/*/*/categories/extension.*
+%{_datadir}/icons/*/*/status/news-feed.*
%changelog
+* Mon Sep 08 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.20-1
+- Update to new upstream release (0.0.20): adds support for single instances,
+ some userscripts and Greasemonkey scripting, zooming and printing, as well as
+ enhanced news feed detection and session-saving (among other improvements).
+- Switch to WAF build system.
+- Add scriplets for GTK+ icon cache.
+- fix license tag (thanks to Tom Callaway)
+
* Sat May 24 2008 Peter Gordon <peter at thecodergeek.com> - 0.0.18-1
- Update to new upstream release (0.0.18), adds some translations and
a lot of bug-fixes.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 25 May 2008 22:44:07 -0000 1.3
+++ sources 8 Sep 2008 18:32:40 -0000 1.4
@@ -1 +1 @@
-aa9c10bbf6fe3502a65633c4fac0fb80 midori-0.0.18.tar.gz
+d27799c093b13e124eb7c0f479ea26c0 midori-0.0.20.tar.bz2
- Previous message (by thread): rpms/perl-Class-Method-Modifiers/devel import.log, NONE, 1.1 perl-Class-Method-Modifiers.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/docbook-utils/devel docbook2man-spec.pl, NONE, 1.1 docbook-utils.spec, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list