rpms/gwget/FC-5 gwget-epiphany21x.patch, NONE, 1.1 gwget-epiphany214.patch, 1.1, NONE

Christoph Wickert (cwickert) fedora-extras-commits at redhat.com
Sat Nov 11 03:17:50 UTC 2006


Author: cwickert

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21730

Added Files:
	gwget-epiphany21x.patch 
Removed Files:
	gwget-epiphany214.patch 
Log Message:
include the correct patch

gwget-epiphany21x.patch:

--- NEW FILE gwget-epiphany21x.patch ---
--- gwget-0.98.2/configure.in.orig	2006-11-08 19:49:44.000000000 +0100
+++ gwget-0.98.2/configure.in	2006-11-11 03:04:53.000000000 +0100
@@ -97,13 +97,15 @@
 
 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@:>@],
+                       [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 (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 or 2.16
+dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8, 1.10, 2.14, 2.15, 2.16 or 2.17
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.16; then
+if pkg-config --exists epiphany-2.17; then
+        EPHY_VER=2.17
+elif pkg-config --exists epiphany-2.16; then
         EPHY_VER=2.16
 elif pkg-config --exists epiphany-2.15; then
         EPHY_VER=2.15
@@ -158,13 +160,17 @@
           EPIPHANY_PKGCONFIG=epiphany-2.16
           EPIPHANY_REQUIRED=2.16
           EPIPHANY_SHORTVER=216
+elif test "x$EPHY_VER" = "x2.17"; then
+          EPIPHANY_PKGCONFIG=epiphany-2.17
+          EPIPHANY_REQUIRED=2.17
+          EPIPHANY_SHORTVER=217
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
 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 or 217)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


--- gwget-epiphany214.patch DELETED ---




More information about the scm-commits mailing list