rpms/gwget/devel gwget-1.0.1-epiphany.patch, NONE, 1.1 gwget.spec, 1.31, 1.32 gwget-1.0.1-epiphany-typo.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22315

Modified Files:
	gwget.spec 
Added Files:
	gwget-1.0.1-epiphany.patch 
Removed Files:
	gwget-1.0.1-epiphany-typo.patch 
Log Message:
* Thu Jun 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-4
- Rebuild against epiphany 2.27 and already prepare for 2.28


gwget-1.0.1-epiphany.patch:

--- NEW FILE gwget-1.0.1-epiphany.patch ---
diff -dur gwget-1.0.1.orig/configure gwget-1.0.1/configure
--- gwget-1.0.1.orig/configure	2009-02-17 19:15:31.000000000 +0100
+++ gwget-1.0.1/configure	2009-06-11 03:17:16.000000000 +0200
@@ -1559,7 +1559,7 @@
   --with-epiphany-version[=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26]
                           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 (default 1.6)
+                          2.26 or 2.28 (default 1.6)
   --with-extension-prefix=path              Epiphany extension prefix
 
 Some influential environment variables:
@@ -14393,7 +14393,11 @@
 
 
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.26; then
+if pkg-config --exists epiphany-2.28; then
+        EPHY_VER=2.28
+elif pkg-config --exists epiphany-2.27; then
+        EPHY_VER=2.27
+elif pkg-config --exists epiphany-2.26; then
         EPHY_VER=2.26
 elif pkg-config --exists epiphany-2.25; then
         EPHY_VER=2.25
@@ -14504,10 +14508,18 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.25
           EPIPHANY_REQUIRED=2.25
 	  EPIPHANY_SHORTVER=225
-elif test "x$EPHY_VER" = "x2.18"; then
+elif test "x$EPHY_VER" = "x2.26"; then
 	  EPIPHANY_PKGCONFIG=epiphany-2.26
           EPIPHANY_REQUIRED=2.26
 	  EPIPHANY_SHORTVER=226
+elif test "x$EPHY_VER" = "x2.27"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.27
+          EPIPHANY_REQUIRED=2.27
+	  EPIPHANY_SHORTVER=227
+elif test "x$EPHY_VER" = "x2.28"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.28
+          EPIPHANY_REQUIRED=2.28
+	  EPIPHANY_SHORTVER=228
 else
      	{ echo "$as_me:$LINENO: result: no epiphany installed" >&5
 echo "${ECHO_T}no epiphany installed" >&6; }
diff -dur gwget-1.0.1.orig/configure.ac gwget-1.0.1/configure.ac
--- gwget-1.0.1.orig/configure.ac	2009-02-17 19:15:04.000000000 +0100
+++ gwget-1.0.1/configure.ac	2009-06-11 03:17:13.000000000 +0200
@@ -98,13 +98,17 @@
 
 EPHY_VER=
 AC_ARG_WITH([epiphany-version],
-        AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14|2.16|2.18|2.20|2.22|2.24|2.26@:>@],
-                       [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 (default 1.6)]),
+        AC_HELP_STRING([--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@:>@],
+                       [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)]),
         [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, 2.18, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25 or 2.26
+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, 2.21, 2.22, 2.23, 2.24, 2.25, 2.26, 2.27 or 2.28
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.26; then
+if pkg-config --exists epiphany-2.28; then
+        EPHY_VER=2.28
+elif pkg-config --exists epiphany-2.27; then
+        EPHY_VER=2.27
+elif pkg-config --exists epiphany-2.26; then
         EPHY_VER=2.26
 elif pkg-config --exists epiphany-2.25; then
         EPHY_VER=2.25
@@ -215,10 +219,18 @@
 	  EPIPHANY_PKGCONFIG=epiphany-2.25
           EPIPHANY_REQUIRED=2.25
 	  EPIPHANY_SHORTVER=225
-elif test "x$EPHY_VER" = "x2.18"; then
+elif test "x$EPHY_VER" = "x2.26"; then
 	  EPIPHANY_PKGCONFIG=epiphany-2.26
           EPIPHANY_REQUIRED=2.26
 	  EPIPHANY_SHORTVER=226
+elif test "x$EPHY_VER" = "x2.27"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.27
+          EPIPHANY_REQUIRED=2.27
+	  EPIPHANY_SHORTVER=227
+elif test "x$EPHY_VER" = "x2.28"; then
+	  EPIPHANY_PKGCONFIG=epiphany-2.28
+          EPIPHANY_REQUIRED=2.28
+	  EPIPHANY_SHORTVER=228
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gwget.spec	10 Jun 2009 23:59:43 -0000	1.31
+++ gwget.spec	11 Jun 2009 01:27:59 -0000	1.32
@@ -2,14 +2,14 @@
 
 Name:		gwget
 Version:	1.0.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Graphical download manager that uses wget
 
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://gnome.org/projects/gwget
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/%{version}/gwget-%{version}.tar.bz2
-Patch0:		gwget-1.0.1-epiphany-typo.patch
+Patch0:		gwget-1.0.1-epiphany.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -113,6 +113,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Thu Jun 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-4
+- Rebuild against epiphany 2.27 and already prepare for 2.28
+
 * Thu Jun 11 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-3
 - Make configure detect epiphany 2.26 again (stupid typo)
 


--- gwget-1.0.1-epiphany-typo.patch DELETED ---