rpms/gwget/devel gwget-0.99-epiphany.patch, 1.1, 1.2 gwget.spec, 1.23, 1.24

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32146

Modified Files:
	gwget-0.99-epiphany.patch gwget.spec 
Log Message:
* Tue Jan 08 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-4
- Build against epiphany 2.21


gwget-0.99-epiphany.patch:

Index: gwget-0.99-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget-0.99-epiphany.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwget-0.99-epiphany.patch	25 Sep 2007 23:23:45 -0000	1.1
+++ gwget-0.99-epiphany.patch	7 Jan 2008 23:16:18 -0000	1.2
@@ -1,22 +1,26 @@
 --- gwget-0.99/configure.in.orig	2007-06-09 20:51:03.000000000 +0200
 +++ gwget-0.99/configure.in	2007-06-09 20:56:14.000000000 +0200
-@@ -97,14 +97,18 @@
+@@ -97,14 +97,22 @@
  
  EPHY_VER=
  AC_ARG_WITH([epiphany-version],
 -        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
 -                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (default 1.6)]),
-+        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19@:>@],
-+                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 (default 1.6)]),
++        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.15|2.16|2.17|2.18|2.19|2.20|2.21|2.22@:>@],
++                       [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 or 2.15 or 2.16 or 2.17 or 2.18 or 2.19 or 2.20 or 2.21 or 2.22 (default 1.6)]),
          [EPHY_VER="$withval"])
  
 -dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17 or 2.18
-+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18 or 2.19 or 2.20
++dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16, 2.17, 2.18, 2.19, 2.20, 221 or 2.22
  EPHY_AUTODETECT="(autodetect)"
 -if pkg-config --exists epiphany-2.18; then
 -	EPHY_VER=2.18
-+if pkg-config --exists epiphany-2.20; then
-+	EPHY_VER=2.20
++if pkg-config --exists epiphany-2.22; then
++	EPHY_VER=2.22
++elif pkg-config --exists epiphany-2.21; then
++        EPHY_VER=2.21
++elif pkg-config --exists epiphany-2.20; then
++        EPHY_VER=2.20
 +elif pkg-config --exists epiphany-2.19; then
 +        EPHY_VER=2.19
 +elif pkg-config --exists epiphany-2.18; then
@@ -24,7 +28,7 @@
  elif pkg-config --exists epiphany-2.17; then
          EPHY_VER=2.17
  elif pkg-config --exists epiphany-2.16; then
-@@ -170,13 +174,21 @@
+@@ -170,13 +178,29 @@
  	  EPIPHANY_PKGCONFIG=epiphany-2.18
            EPIPHANY_REQUIRED=2.18
  	  EPIPHANY_SHORTVER=218
@@ -36,6 +40,14 @@
 +	  EPIPHANY_PKGCONFIG=epiphany-2.20
 +          EPIPHANY_REQUIRED=2.20
 +	  EPIPHANY_SHORTVER=220
++elif test "x$EPHY_VER" = "x2.21"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.21
++          EPIPHANY_REQUIRED=2.21
++	  EPIPHANY_SHORTVER=221
++elif test "x$EPHY_VER" = "x2.22"; then
++	  EPIPHANY_PKGCONFIG=epiphany-2.22
++          EPIPHANY_REQUIRED=2.22
++	  EPIPHANY_SHORTVER=222
  else
       	AC_MSG_RESULT([no epiphany installed])
  fi
@@ -43,7 +55,7 @@
  if test -n "$EPIPHANY_SHORTVER" ; then
  AC_DEFINE_UNQUOTED(EPHY_VERSION, "$EPIPHANY_SHORTVER",
 -       [Define to the Epiphany version (12, 14, 16, 18, 110 ,214, or 215)])
-+       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219 or 220)])
++       [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221 or 222)])
  AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
  
  LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gwget.spec	25 Sep 2007 23:23:45 -0000	1.23
+++ gwget.spec	7 Jan 2008 23:16:18 -0000	1.24
@@ -1,8 +1,8 @@
-%define epimajor 2.20
+%define epimajor 2.21
 
 Name:		gwget
 Version:	0.99
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Tue Jan 08 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-4
+- Build against epiphany 2.21
+
 * Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
 - Build against epiphany 2.20