rpms/midori/F-13 midori-0.2.4-docdir.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 midori.spec, 1.34, 1.35 sources, 1.18, 1.19

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/midori/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22973/F-13

Modified Files:
	.cvsignore midori.spec sources 
Added Files:
	midori-0.2.4-docdir.patch 
Log Message:
* Sun Mar 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
- Update to 0.2.4
- Fix docs location (#523778)
- Update gtk icon cache scriptlets


midori-0.2.4-docdir.patch:
 midori/midori-browser.c |    6 +++---
 wscript                 |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE midori-0.2.4-docdir.patch ---
diff -dur midori-0.2.4.orig/midori/midori-browser.c midori-0.2.4/midori/midori-browser.c
--- midori-0.2.4.orig/midori/midori-browser.c	2010-03-07 22:23:04.000000000 +0100
+++ midori-0.2.4/midori/midori-browser.c	2010-03-21 01:53:22.000000000 +0100
@@ -5050,10 +5050,10 @@
         }
         #else
         #ifdef DOCDIR
-        uri = "file://" DOCDIR "/midori/user/midori.html";
-        if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0)
+        uri = "file://" DOCDIR "/user/midori.html";
+        if (g_access (DOCDIR "/user/midori.html", F_OK) != 0)
         #endif
-            uri = "error:nodocs " DOCDIR "/midori/user/midori.html";
+            uri = "error:nodocs " DOCDIR "/user/midori.html";
         #endif
     }
     else if  (!strncmp ("HelpFAQ", action_name, 7))
diff -dur midori-0.2.4.orig/wscript midori-0.2.4/wscript
--- midori-0.2.4.orig/wscript	2010-03-07 22:23:04.000000000 +0100
+++ midori-0.2.4/wscript	2010-03-21 01:51:52.000000000 +0100
@@ -426,7 +426,7 @@
     bld.add_group ()
 
     if bld.env['docs']:
-        bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
+        bld.install_files ('${DOCDIR}/', \
             'AUTHORS COPYING ChangeLog EXPAT README')
 
     # Install default configuration
@@ -443,7 +443,7 @@
             '../../../docs/user/midori.txt ' + 'midori.html'
         Utils.exec_command (command)
         os.chdir ('../../..')
-        bld.install_files ('${DOCDIR}/midori/user/', blddir + '/docs/user/midori.html')
+        bld.install_files ('${DOCDIR}/user/', blddir + '/docs/user/midori.html')
 
     if bld.env['INTLTOOL']:
         obj = bld.new_task_gen ('intltool_po')
@@ -452,7 +452,7 @@
 
     if bld.env['GTKDOC_SCAN'] and Options.commands['build']:
         bld.add_subdirs ('docs/api')
-        bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*')
+        bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*')
 
     if not is_mingw (bld.env) and Options.platform != 'win32':
         if bld.env['HAVE_HILDON']:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-13/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	20 Feb 2010 22:05:34 -0000	1.18
+++ .cvsignore	21 Mar 2010 01:27:22 -0000	1.19
@@ -1 +1 @@
-midori-0.2.3.tar.bz2
+midori-0.2.4.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-13/midori.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- midori.spec	20 Feb 2010 22:05:34 -0000	1.34
+++ midori.spec	21 Mar 2010 01:27:22 -0000	1.35
@@ -1,5 +1,5 @@
 Name:		midori
-Version:	0.2.3
+Version:	0.2.4
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
@@ -12,6 +12,8 @@ Source0:	http://archive.xfce.org/src/app
 ## Fedora-specific: Set the default homepage to start.fedoraproject.org
 ## instead of Google.
 Patch0: 	%{name}-fedora-homepage.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=523778
+Patch1:		%{name}-0.2.4-docdir.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +53,8 @@ implemented, and some are still quite in
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
 #rm -rf waf
-%patch0 -b .fedora-homepage 
+%patch0 -b .fedora-homepage
+%patch1 -p1 -b .docdir
 
 
 %build
@@ -83,19 +86,20 @@ 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
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+if [ $1 -eq 0 ] ; then
+	touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+	gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/
@@ -112,8 +116,14 @@ fi
 
 
 %changelog
+* Sun Mar 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.4-1
+- Update to 0.2.4
+- Fix docs location (#523778)
+- Update gtk icon cache scriptlets
+
 * Sat Feb 20 2010 Adam Miller <maxamillion at fedoraproject.org> - 0.2.3-1
 - Update to 0.2.3 - spec patch by Kevin Fenzi <kevin at tummy.com>
+
 * Fri Jan 29 2010 Peter Gordon <peter at thecodergeek.com> - 0.2.2-2
 - Apply patch to set the Fedora-specific default homepage
   (start.fedoraproject.org), for consistency with other browser packages such


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-13/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	20 Feb 2010 22:05:34 -0000	1.18
+++ sources	21 Mar 2010 01:27:22 -0000	1.19
@@ -1 +1 @@
-7289b170ab14925c2dc889f57a0b6a70  midori-0.2.3.tar.bz2
+ccd2ae162993c2c92c9e0eac7778c62d  midori-0.2.4.tar.bz2