diff --git a/gwget-1.0.1-epiphany-typo.patch b/gwget-1.0.1-epiphany-typo.patch new file mode 100644 index 0000000..eb4521b --- /dev/null +++ b/gwget-1.0.1-epiphany-typo.patch @@ -0,0 +1,24 @@ +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 01:42:09.000000000 +0200 +@@ -14504,7 +14504,7 @@ + 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 +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 01:42:58.000000000 +0200 +@@ -215,7 +215,7 @@ + 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 diff --git a/gwget-1.00-epiphany.patch b/gwget-1.00-epiphany.patch deleted file mode 100644 index 0cfa5c6..0000000 --- a/gwget-1.00-epiphany.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -dur gwget-1.00.orig/configure gwget-1.00/configure ---- gwget-1.00.orig/configure 2009-02-12 20:31:13.000000000 +0100 -+++ gwget-1.00/configure 2009-02-14 23:59:46.000000000 +0100 -@@ -1556,9 +1556,10 @@ - Config database for installing schema files. - --with-gconf-schema-file-dir=dir - Directory for installing schema files. -- --with-epiphany-version[=1.6|1.8|1.10|2.14] -+ --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 (default 1.6) -+ or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24 -+ or 2.26 (default 1.6) - --with-extension-prefix=path Epiphany extension prefix - - Some influential environment variables: -@@ -14392,8 +14393,24 @@ - - - EPHY_AUTODETECT="(autodetect)" --if pkg-config --exists epiphany-2.18; then -- EPHY_VER=2.18 -+if pkg-config --exists epiphany-2.26; then -+ EPHY_VER=2.26 -+elif pkg-config --exists epiphany-2.25; then -+ EPHY_VER=2.25 -+elif pkg-config --exists epiphany-2.24; then -+ EPHY_VER=2.24 -+elif pkg-config --exists epiphany-2.23; then -+ EPHY_VER=2.23 -+elif 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 -+ EPHY_VER=2.18 - elif pkg-config --exists epiphany-2.17; then - EPHY_VER=2.17 - elif pkg-config --exists epiphany-2.16; then -@@ -14459,6 +14476,38 @@ - 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 -+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 -+elif test "x$EPHY_VER" = "x2.23"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.23 -+ EPIPHANY_REQUIRED=2.23 -+ EPIPHANY_SHORTVER=223 -+elif test "x$EPHY_VER" = "x2.24"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.24 -+ EPIPHANY_REQUIRED=2.24 -+ EPIPHANY_SHORTVER=224 -+elif test "x$EPHY_VER" = "x2.25"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.25 -+ EPIPHANY_REQUIRED=2.25 -+ EPIPHANY_SHORTVER=225 -+elif test "x$EPHY_VER" = "x2.18"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.26 -+ EPIPHANY_REQUIRED=2.26 -+ EPIPHANY_SHORTVER=226 - else - { echo "$as_me:$LINENO: result: no epiphany installed" >&5 - echo "${ECHO_T}no epiphany installed" >&6; } -diff -dur gwget-1.00.orig/configure.ac gwget-1.00/configure.ac ---- gwget-1.00.orig/configure.ac 2009-02-12 20:30:56.000000000 +0100 -+++ gwget-1.00/configure.ac 2009-02-14 23:59:40.000000000 +0100 -@@ -98,14 +98,30 @@ - - 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.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)]), - [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, 2.19, 2.20, 2.21, 2.22, 2.23, 2.24, 2.25 or 2.26 - EPHY_AUTODETECT="(autodetect)" --if pkg-config --exists epiphany-2.18; then -- EPHY_VER=2.18 -+if pkg-config --exists epiphany-2.26; then -+ EPHY_VER=2.26 -+elif pkg-config --exists epiphany-2.25; then -+ EPHY_VER=2.25 -+elif pkg-config --exists epiphany-2.24; then -+ EPHY_VER=2.24 -+elif pkg-config --exists epiphany-2.23; then -+ EPHY_VER=2.23 -+elif 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 -+ EPHY_VER=2.18 - elif pkg-config --exists epiphany-2.17; then - EPHY_VER=2.17 - elif pkg-config --exists epiphany-2.16; then -@@ -171,13 +187,45 @@ - 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 -+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 -+elif test "x$EPHY_VER" = "x2.23"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.23 -+ EPIPHANY_REQUIRED=2.23 -+ EPIPHANY_SHORTVER=223 -+elif test "x$EPHY_VER" = "x2.24"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.24 -+ EPIPHANY_REQUIRED=2.24 -+ EPIPHANY_SHORTVER=224 -+elif test "x$EPHY_VER" = "x2.25"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.25 -+ EPIPHANY_REQUIRED=2.25 -+ EPIPHANY_SHORTVER=225 -+elif test "x$EPHY_VER" = "x2.18"; then -+ EPIPHANY_PKGCONFIG=epiphany-2.26 -+ EPIPHANY_REQUIRED=2.26 -+ EPIPHANY_SHORTVER=226 - 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, 220, 221, 222, 223, 224, 225 or 226)]) - AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT]) - - LIBGLIB_REQUIRED=2.4.0 diff --git a/gwget-1.00-gnome-cflags.patch b/gwget-1.00-gnome-cflags.patch deleted file mode 100644 index ad4cd2a..0000000 --- a/gwget-1.00-gnome-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- trunk/epiphany-extension/Makefile.am 2006/05/13 17:14:07 461 -+++ trunk/epiphany-extension/Makefile.am 2009/02/15 15:06:11 625 -@@ -11,7 +11,8 @@ - -DEPHY_EXTENSIONS_LOCALEDIR=\"$(datadir)/locale\" \ - -I$(top_srcdir)/src \ - $(DBUS_CFLAGS) \ -- -I$(top_builddir)/include -+ -I$(top_builddir)/include \ -+ @GNOME_CFLAGS@ - - libgwgetextension_la_SOURCES = \ - ephy-gwget.c \ diff --git a/gwget.spec b/gwget.spec index bb8b18d..f31e7ff 100644 --- a/gwget.spec +++ b/gwget.spec @@ -1,14 +1,15 @@ -%define epimajor 2.25 +%define epimajor 2.26 Name: gwget Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?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 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel >= 2.0 @@ -39,11 +40,12 @@ Requires: %{name} = %{version} Requires: epiphany >= %{epimajor} %description epiphany-extension -This Package contains gwget2 extensions for epiphany. +This package contains gwget2 extensions for epiphany. %prep %setup -q +%patch0 -p1 -b .epiphany # convert files to UTF-8 with preserving the timestamps for file in ChangeLog README; do mv $file timestamp @@ -111,6 +113,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` %changelog +* Thu Jun 11 2009 Christoph Wickert - 1.0.1-3 +- Make configure detect epiphany 2.26 again (stupid typo) + * Tue Feb 24 2009 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild