rpms/midori/devel .cvsignore, 1.9, 1.10 midori.spec, 1.19, 1.20 sources, 1.9, 1.10

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/midori/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18071

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
Update to 0.1.5; temporarily disable single-instance support (broken with libunique 1.0.4) and temporarily switch to using the in-tarball waf to build (FTBFS otherwise, due to a python error).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Mar 2009 06:42:46 -0000	1.9
+++ .cvsignore	11 Apr 2009 19:36:16 -0000	1.10
@@ -1 +1 @@
-midori-0.1.4.tar.bz2
+midori-0.1.5.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- midori.spec	10 Mar 2009 16:32:22 -0000	1.19
+++ midori.spec	11 Apr 2009 19:36:16 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		midori
-Version:	0.1.4
-Release:	2%{?dist}
+Version:	0.1.5
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -25,8 +25,9 @@
 BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
-BuildRequires:	waf >= 1.5
-BuildRequires:	WebKit-gtk-devel
+## XXX: Using the system waf makes it fail to build (python error).
+# BuildRequires:	waf >= 1.5
+BuildRequires:	webkitgtk-devel >= 1.1.1
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -46,21 +47,22 @@
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-rm -rf waf
+#rm -rf waf
 
 
 %build
 export CFLAGS="%{optflags}"
-waf	--prefix=%{_usr}			\
+./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
-	configure
-waf %{?_smp_mflags} build
+	configure				\
+		--disable-unique
+./waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-waf --destdir=%{buildroot} install
+./waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -101,6 +103,13 @@
 
 
 %changelog
+* Sat Apr 11 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.5-2
+- Update to new upstream release (0.1.5): download support (with WebKitGTK
+  1.1.3+), a new "Colorful Tabs" extension, and saving of extension settings.
+- Temporarily switch to building using the in-tarball waf (FTBFS otherwise).
+- Temporarily disable libunique (single-instance) support, as it's broken
+  with libunique 1.0.4 (which is the current in rawhide).
+
 * Tue Mar 10 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.4-2
 - Build against the recently-updated libidn for proper IDN support.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	8 Mar 2009 06:42:47 -0000	1.9
+++ sources	11 Apr 2009 19:36:16 -0000	1.10
@@ -1 +1 @@
-a9b21027ba894fed3055d7074c5f073d  midori-0.1.4.tar.bz2
+dccaddeb49d7def8a19cf497cb7eabf8  midori-0.1.5.tar.bz2