rpms/gwget/devel gwget-0.99-epiphany.patch, NONE, 1.1 gwget.spec, 1.22, 1.23 gwget-0.99-epiphany220.patch, 1.1, NONE

Tue Sep 25 23:24:18 UTC 2007

Author: cwickert

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

Modified Files:
	gwget.spec 
Added Files:
	gwget-0.99-epiphany.patch 
Removed Files:
	gwget-0.99-epiphany220.patch 
Log Message:
rename patch

gwget-0.99-epiphany.patch:

--- NEW FILE gwget-0.99-epiphany.patch ---
--- 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 @@
 
 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)]),
         [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
 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
+elif pkg-config --exists epiphany-2.19; then
+        EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+        EPHY_VER=2.18
 elif pkg-config --exists epiphany-2.17; then
         EPHY_VER=2.17
 elif pkg-config --exists epiphany-2.16; then
@@ -170,13 +174,21 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.18
           EPIPHANY_REQUIRED=2.18
 	  EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.19
+          EPIPHANY_REQUIRED=2.19
+	  EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.20
+          EPIPHANY_REQUIRED=2.20
+	  EPIPHANY_SHORTVER=220
 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, 217, 218, 219 or 220)])
 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gwget.spec	25 Sep 2007 23:05:33 -0000	1.22
+++ gwget.spec	25 Sep 2007 23:23:45 -0000	1.23
@@ -10,7 +10,7 @@
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.99/gwget-0.99.tar.bz2
 Source1:	gwget.desktop
-Patch0:		gwget-0.99-epiphany219.patch
+Patch0:		gwget-0.99-epiphany.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0


--- gwget-0.99-epiphany220.patch DELETED ---


