rpms/midori/devel midori-no-git.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 midori.spec, 1.13, 1.14 sources, 1.7, 1.8

[Peter Gordon]

Author: pgordon

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

Modified Files:
	.cvsignore midori.spec sources 
Added Files:
	midori-no-git.patch 
Log Message:
Update to 0.1.3

midori-no-git.patch:

--- NEW FILE midori-no-git.patch ---
diff -up ./wscript.old ./wscript
--- ./wscript.old	2009-02-22 16:43:47.000000000 -0800
+++ ./wscript	2009-02-22 16:43:52.000000000 -0800
@@ -27,10 +27,6 @@ micro = 3
 APPNAME = 'midori'
 VERSION = str (major) + '.' + str (minor) + '.' + str (micro)
 
-git = Utils.cmd_output (['git', 'rev-parse', '--short', 'HEAD'], silent=True)
-if git:
-    VERSION = (VERSION + '-' + git).strip ()
-
 srcdir = '.'
 blddir = '_build_'
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Feb 2009 01:59:24 -0000	1.7
+++ .cvsignore	23 Feb 2009 04:38:57 -0000	1.8
@@ -1 +1 @@
-midori-0.1.2.tar.bz2
+midori-0.1.3.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/midori.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- midori.spec	1 Feb 2009 01:59:25 -0000	1.13
+++ midori.spec	23 Feb 2009 04:38:57 -0000	1.14
@@ -1,5 +1,5 @@
-Name:		midori
-Version:	0.1.2
+2Name:		midori
+Version:	0.1.3
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -9,6 +9,10 @@
 
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
 
+## No need to try using git for retrieving the version information, since it's a release
+## tarball.
+Patch0: 	%{name}-no-git.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -46,6 +50,7 @@
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
 rm -rf waf
+%patch0 -b .no-git
 
 
 %build
@@ -96,11 +101,18 @@
 %{_datadir}/icons/*/*/status/news-feed.*
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
+%{_sysconfdir}/xdg/%{name}/
 
 
 %changelog
+* Sun Feb 22 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.3-1
+- Update to new upstream release (0.1.3): support for bookmark folders,
+  full image zoom, and "Find as you type" (among other enhancements).
+- Add patch to remove git build-time dependency:
+  + no-git.patch
+
 * Sat Jan 31 2009 Peter Gordon <peter at thecodergeek.com> - 0.1.2-1
-- Update ot new upstream release (0.1.2): support for bookmarklets
+- Update to new upstream release (0.1.2): support for bookmarklets
   ("javascript:foo" URLs and bookmarks), better persistent cookie support,
   preference changes saved dynamically. Lots of startup fixes for speed
   issues, too. :)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Feb 2009 01:59:25 -0000	1.7
+++ sources	23 Feb 2009 04:38:57 -0000	1.8
@@ -1 +1 @@
-5169ead6783f374cedf3f89bf399bd75  midori-0.1.2.tar.bz2
+ebfcce4c60859d051ce2df5cafc494a1  midori-0.1.3.tar.bz2