rpms/gwget/devel gwget-1.0.4-epiphany.patch, 1.1, 1.2 gwget.spec, 1.39, 1.40

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3127

Modified Files:
	gwget-1.0.4-epiphany.patch gwget.spec 
Log Message:
* Thu Jun 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-3
- Support for epiphany 2.31 and 2.32


gwget-1.0.4-epiphany.patch:
 configure |   30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

Index: gwget-1.0.4-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget-1.0.4-epiphany.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gwget-1.0.4-epiphany.patch	16 Feb 2010 21:54:42 -0000	1.1
+++ gwget-1.0.4-epiphany.patch	3 Jun 2010 20:57:28 -0000	1.2
@@ -5,20 +5,24 @@
    --with-gconf-schema-file-dir=dir
                            Directory for installing schema files.
 -  --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28]
-+  --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28|2.29|2.30]
++  --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26|2.28|2.29|2.30|2.31|2.32]
                            Whether to use epiphany version 1.6 or 1.8 or 1.10
                            or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 or
 -                          2.26 or 2.28 (default 1.6)
-+                          2.26 or 2.28 or 2.29 or 2.30 (default 1.6)
++                          2.26 or 2.28 or 2.29 or 2.30 or 2.31 or 2.32 (default 1.6)
    --with-extension-prefix=path              Epiphany extension prefix
  
  Some influential environment variables:
-@@ -14382,7 +14382,11 @@
+@@ -14382,7 +14382,15 @@
  
  
  EPHY_AUTODETECT="(autodetect)"
 -if pkg-config --exists epiphany-2.28; then
-+if pkg-config --exists epiphany-2.30; then
++if pkg-config --exists epiphany-2.32; then
++        EPHY_VER=2.32
++elif pkg-config --exists epiphany-2.31; then
++        EPHY_VER=2.31
++elif pkg-config --exists epiphany-2.30; then
 +        EPHY_VER=2.30
 +elif pkg-config --exists epiphany-2.29; then
 +        EPHY_VER=2.29
@@ -26,7 +30,7 @@
          EPHY_VER=2.28
  elif pkg-config --exists epiphany-2.27; then
          EPHY_VER=2.27
-@@ -14509,6 +14513,14 @@
+@@ -14509,6 +14517,22 @@
  	  EPIPHANY_PKGCONFIG=epiphany-2.28
            EPIPHANY_REQUIRED=2.28
  	  EPIPHANY_SHORTVER=228
@@ -38,6 +42,14 @@
 +	  EPIPHANY_PKGCONFIG=epiphany-2.30
 +          EPIPHANY_REQUIRED=2.30
 +	  EPIPHANY_SHORTVER=230
++elif test "x$EPHY_VER" = "x2.31"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.31
++          EPIPHANY_REQUIRED=2.31
++	  EPIPHANY_SHORTVER=231
++elif test "x$EPHY_VER" = "x2.32"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.32
++          EPIPHANY_REQUIRED=2.32
++	  EPIPHANY_SHORTVER=232
  else
       	{ echo "$as_me:$LINENO: result: no epiphany installed" >&5
  echo "${ECHO_T}no epiphany installed" >&6; }


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- gwget.spec	16 Feb 2010 21:54:42 -0000	1.39
+++ gwget.spec	3 Jun 2010 20:57:29 -0000	1.40
@@ -1,11 +1,11 @@
-%global epimajor 2.26
+%global epimajor 2.30
 # by default build epiphany extension
 # use bcond_with to change the default
 %bcond_without epiphany
 
 Name:		gwget
 Version:	1.0.4
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
@@ -120,6 +120,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Thu Jun 03 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-3
+- Support for epiphany 2.31 and 2.32
+
 * Tue Feb 16 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.4-2
 - Rebuild for epiphany 2.29
 - Switch to %%bcond macro