rpms/epiphany/devel .cvsignore, 1.46, 1.47 epiphany.spec, 1.122, 1.123 sources, 1.47, 1.48

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13553

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.16.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	4 Sep 2006 01:26:20 -0000	1.46
+++ .cvsignore	21 Oct 2006 23:18:29 -0000	1.47
@@ -1,2 +1 @@
-epiphany-2.16.0.tar.bz2
-epiphany-2.15.92.tar.bz2
+epiphany-2.16.1.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- epiphany.spec	12 Oct 2006 18:30:21 -0000	1.122
+++ epiphany.spec	21 Oct 2006 23:18:30 -0000	1.123
@@ -8,8 +8,8 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.16.0
-Release: 4%{?dist}
+Version: 2.16.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -19,6 +19,7 @@
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post): GConf2
+Requires(pre): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
@@ -66,6 +67,7 @@
 Requires: gnome-doc-utils >= %{gnome_doc_utils_ver}
 Requires: gnome-desktop-devel
 Requires: startup-notification-devel
+Requires: pkgconfig
 
 %description devel
 epiphany is a web browser based on the Mozilla rendering engine.
@@ -111,19 +113,27 @@
   %{_sysconfdir}/gconf/schemas/epiphany.schemas \
   %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas \
   %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas \
-  %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null
+  %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null || :
 scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/epiphany.schemas \
+      %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null || :
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/epiphany.schemas \
-      %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null
+      %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas >& /dev/null || :
 fi
 
 %postun
@@ -163,6 +173,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sat Oct 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
+- Update to 2.16.1
+
 * Thu Oct 12 2006 Christopher Aillon <caillon at redhat.com> - 2.16.0-4.fc6
 - Remove console spew about pango; it's no longer relevant.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	4 Sep 2006 01:26:20 -0000	1.47
+++ sources	21 Oct 2006 23:18:30 -0000	1.48
@@ -1 +1 @@
-dd68883fae26a60bfc51072fc3771f26  epiphany-2.16.0.tar.bz2
+25fecb147b1c68cc71d2af2bac727724  epiphany-2.16.1.tar.bz2