rpms/midori/F-12 .cvsignore, 1.17, 1.18 midori.spec, 1.32, 1.33 sources, 1.17, 1.18

[Christoph Wickert]

Author: cwickert

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

Modified Files:
	.cvsignore midori.spec sources 
Log Message:
* Tue May 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5
- Update to 0.2.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	16 Dec 2009 19:39:54 -0000	1.17
+++ .cvsignore	18 May 2010 13:19:14 -0000	1.18
@@ -1 +1 @@
-midori-0.2.2.tar.bz2
+midori-0.2.5.tar.bz2


Index: midori.spec
===================================================================
RCS file: /cvs/pkgs/rpms/midori/F-12/midori.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- midori.spec	29 Jan 2010 22:48:39 -0000	1.32
+++ midori.spec	18 May 2010 13:19:15 -0000	1.33
@@ -1,17 +1,19 @@
 Name:		midori
-Version:	0.2.2
-Release:	2%{?dist}
+Version:	0.2.5
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
 License:	LGPLv2+
 URL:		http://software.twotoasts.de/?page=midori
 
-Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:	http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2
 
 ## 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)
 
@@ -20,6 +22,7 @@ BuildRequires:	gettext
 BuildRequires:	gtksourceview2-devel
 BuildRequires:	intltool
 BuildRequires:	libidn-devel
+BuildRequires:  libnotify-devel
 BuildRequires:	libsexy-devel
 BuildRequires:	librsvg2
 BuildRequires:	libsoup-devel >= 2.25.2
@@ -50,22 +53,27 @@ implemented, and some are still quite in
 %prep
 %setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
-rm -rf waf
-%patch0 -b .fedora-homepage 
+#rm -rf waf
+%patch0 -b .fedora-homepage
+%patch1 -p1 -b .docdir
 
 
 %build
 export CFLAGS="%{optflags}"
-waf	--prefix=%{_usr}			\
+## Currently does not build against Fedora waf
+#waf	--prefix=%{_usr}			\
+./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
 	configure
-waf %{?_smp_mflags} build
-
+#waf %{?_smp_mflags} build
+./waf %{?_smp_mflags} build
 
+ 
 %install
 rm -rf %{buildroot}
-waf --destdir=%{buildroot} install
+#waf --destdir=%{buildroot} install
+./waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -79,19 +87,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}/
@@ -103,11 +112,22 @@ fi
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
-%{_sysconfdir}/%{name}/
+#%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
+#%{_sysconfdir}/%{name}/
 
 
 %changelog
+* Tue May 18 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.5
+- Update to 0.2.5
+
+* 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-12/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	16 Dec 2009 19:39:54 -0000	1.17
+++ sources	18 May 2010 13:19:15 -0000	1.18
@@ -1 +1 @@
-14f81a7a10f80a173da1b5e88713400b  midori-0.2.2.tar.bz2
+3aeacd04d4d3e5c3bc16824696ff57b2  midori-0.2.5.tar.bz2