Author: sls Date: Wed Apr 21 17:17:12 2010 GMT Module: packages Tag: HEAD ---- Log message: - added epiphany-230.patch - rel. 2 - bump BR: epiphany-devel
---- Files affected: packages/gwget: gwget.spec (1.32 -> 1.33) , epiphany-230.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gwget/gwget.spec diff -u packages/gwget/gwget.spec:1.32 packages/gwget/gwget.spec:1.33 --- packages/gwget/gwget.spec:1.32 Mon Nov 23 23:49:00 2009 +++ packages/gwget/gwget.spec Wed Apr 21 19:17:05 2010 @@ -3,23 +3,24 @@ # Conditional build: %bcond_without epiphany # don't build epiphany extension # -%define epiphany_version 2.28 +%define epiphany_version 2.30 # Summary: A download manager for GNOME Summary(pl.UTF-8): Zarządca pobierania plików dla GNOME Name: gwget Version: 1.0.4 -Release: 1 +Release: 2 License: GPL v2+ Group: X11/Applications/Networking Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/1.0/%{name}-%{version}.tar.bz2 # Source0-md5: b65ebc752cad068e747ae6ef45fafdcc +Patch0: epiphany-230.patch URL: http://www.gnome.org/projects/gwget/ BuildRequires: GConf2-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: dbus-glib-devel >= 0.73 -%{?with_epiphany:BuildRequires: epiphany-devel >= 2.26.0} +%{?with_epiphany:BuildRequires: epiphany-devel >= 2.30.0} BuildRequires: gettext-devel BuildRequires: gtk+2-devel >= 2:2.10.10 BuildRequires: intltool >= 0.35.5 @@ -54,6 +55,7 @@ %prep %setup -q +%patch0 -p1 %build %{__intltoolize} @@ -114,6 +116,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2010/04/21 17:17:05 sls +- added epiphany-230.patch +- rel. 2 +- bump BR: epiphany-devel + Revision 1.32 2009/11/23 22:49:00 sparky - BR: gettext-devel, libtool ================================================================ Index: packages/gwget/epiphany-230.patch diff -u /dev/null packages/gwget/epiphany-230.patch:1.1 --- /dev/null Wed Apr 21 19:17:12 2010 +++ packages/gwget/epiphany-230.patch Wed Apr 21 19:17:05 2010 @@ -0,0 +1,41 @@ +--- gwget-1.0.4/configure.ac.orig 2010-04-03 12:25:01.619684808 +0200 ++++ gwget-1.0.4/configure.ac 2010-04-03 12:26:28.779675665 +0200 +@@ -96,13 +96,15 @@ + + 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|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)]), ++ 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|2.30@:>@], ++ [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 or 2.30 (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, 2.26, 2.27 or 2.28 ++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 or 2.30 + EPHY_AUTODETECT="(autodetect)" ++if pkg-config --exists epiphany-2.29; then ++ EPHY_VER=2.29 ++elif pkg-config --exists epiphany-2.28; then +-if pkg-config --exists epiphany-2.28; then + EPHY_VER=2.28 + elif pkg-config --exists epiphany-2.27; then + EPHY_VER=2.26 +@@ -229,13 +231,17 @@ + EPIPHANY_PKGCONFIG=epiphany-2.28 + EPIPHANY_REQUIRED=2.28 + EPIPHANY_SHORTVER=228 ++elif test "x$EPHY_VER" = "x2.29"; then ++ EPIPHANY_PKGCONFIG=epiphany-2.29 ++ EPIPHANY_REQUIRED=2.30 ++ EPIPHANY_SHORTVER=230 + 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, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227 or 228)]) ++ [Define to the Epiphany version (12, 14, 16, 18, 110, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227 or 228 or 230)]) + AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT]) + + LIBGLIB_REQUIRED=2.4.0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gwget/gwget.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
