rpms/gwget/devel gwget-epiphany21x.patch,1.1,1.2
Christoph Wickert (cwickert)
fedora-extras-commits at redhat.com
Fri Sep 15 14:33:22 UTC 2006
Author: cwickert
Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27049
Modified Files:
gwget-epiphany21x.patch
Log Message:
upload the correct patch
gwget-epiphany21x.patch:
Index: gwget-epiphany21x.patch
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget-epiphany21x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gwget-epiphany21x.patch 15 Sep 2006 13:41:11 -0000 1.1
+++ gwget-epiphany21x.patch 15 Sep 2006 14:33:22 -0000 1.2
@@ -1,7 +1,6 @@
-diff -Naur gwget-0.97.org/configure.in gwget-0.97/configure.in
---- gwget-0.97.org/configure.in 2006-04-02 10:28:42.000000000 +0200
-+++ gwget-0.97/configure.in 2006-04-02 10:39:58.000000000 +0200
-@@ -71,8 +71,10 @@
+--- gwget-0.97/configure.in.orig 2006-01-05 22:13:55.000000000 +0100
++++ gwget-0.97/configure.in 2006-09-15 13:32:02.000000000 +0200
+@@ -71,8 +71,14 @@
dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
EPHY_AUTODETECT="(autodetect)"
@@ -9,16 +8,16 @@
- EPHY_VER=1.10
+if pkg-config --exists epiphany-2.16; then
+ EPHY_VER=2.16
-+if pkg-config --exists epiphany-2.15; then
++elif pkg-config --exists epiphany-2.15; then
+ EPHY_VER=2.15
-+if pkg-config --exists epiphany-2.14; then
++elif pkg-config --exists epiphany-2.14; then
+ EPHY_VER=2.14
+elif pkg-config --exists epiphany-1.10; then
+ EPHY_VER=1.10
elif pkg-config --exists epiphany-1.8; then
EPHY_VER=1.8
elif pkg-config --exists epiphany-1.6; then
-@@ -107,11 +109,15 @@
+@@ -107,11 +113,23 @@
AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
EPIPHANY_PKGCONFIG=epiphany-1.10
EPIPHANY_REQUIRED=1.9.0
@@ -26,12 +25,20 @@
+ AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
+ EPIPHANY_PKGCONFIG=epiphany-2.14
+ EPIPHANY_REQUIRED=2.14
++elif test $EPHY_VER = "2.15"; then
++ AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
++ EPIPHANY_PKGCONFIG=epiphany-2.15
++ EPIPHANY_REQUIRED=2.15
++elif test $EPHY_VER = "2.16"; then
++ AC_DEFINE_UNQUOTED(EPHY_VERSION, 216, [Define to the Epiphany version (12 or 14 or 16)])
++ EPIPHANY_PKGCONFIG=epiphany-2.16
++ EPIPHANY_REQUIRED=2.16
else
AC_MSG_RESULT([no epiphany installed])
fi
-if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
-+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10" || test $EPHY_VER = "2.14" ; then
++if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10" || test $EPHY_VER = "2.14" || test $EPHY_VER = "2.15" || test $EPHY_VER = "2.16" ; then
AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
LIBGLIB_REQUIRED=2.4.0
More information about the scm-commits
mailing list