rpms/gwget/devel gwget-epiphany-webkit.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 gwget.spec, 1.35, 1.36 sources, 1.12, 1.13 gwget-1.0.1-epiphany.patch, 1.1, NONE

Fri Aug 14 03:21:34 UTC 2009

Author: cwickert

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

Modified Files:
	.cvsignore gwget.spec sources 
Added Files:
	gwget-epiphany-webkit.patch 
Removed Files:
	gwget-1.0.1-epiphany.patch 
Log Message:
* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
- Update to 1.0.2
- Patch to enable epiphany extension again (Vincent Untz)
- No need to run any autotools any longer


gwget-epiphany-webkit.patch:
 configure.ac                              |   24 ++++++++++++++++++------
 epiphany-extension/ephy-gwget-extension.c |    4 ++++
 2 files changed, 22 insertions(+), 6 deletions(-)

--- NEW FILE gwget-epiphany-webkit.patch ---
Index: gwget-1.0.2/configure.ac
===================================================================
--- gwget-1.0.2.orig/configure.ac
+++ gwget-1.0.2/configure.ac
@@ -98,13 +98,17 @@ AC_MSG_CHECKING([which epiphany to use])
 
 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
@@ -219,13 +223,21 @@ 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
 
 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 or 226)])
+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)])
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0
Index: gwget-1.0.2/epiphany-extension/ephy-gwget-extension.c
===================================================================
--- gwget-1.0.2.orig/epiphany-extension/ephy-gwget-extension.c
+++ gwget-1.0.2/epiphany-extension/ephy-gwget-extension.c
@@ -29,8 +29,12 @@
 #endif
 
 
+#if EPHY_VERSION >= 227
+#include <epiphany/epiphany.h>
+#else
 #include <epiphany/ephy-embed-single.h>
 #include <epiphany/ephy-embed-shell.h>
+#endif
 
 #define EPHY_GWGET_EXTENSION_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_GWGET_EXTENSION, EphyGwgetExtensionPrivate))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Feb 2009 02:44:00 -0000	1.12
+++ .cvsignore	14 Aug 2009 03:21:34 -0000	1.13
@@ -1 +1 @@
-gwget-1.0.1.tar.bz2
+gwget-1.0.2.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gwget.spec	25 Jul 2009 01:56:47 -0000	1.35
+++ gwget.spec	14 Aug 2009 03:21:34 -0000	1.36
@@ -1,17 +1,18 @@
 %global epimajor 2.26
-# disable epiphany extension for F12 mass rebuild
-%global _with_epi 0
+# enable/disable epiphany extension
+%global _with_epiphany 1
+# if you comment this out, make sure to remove the %
 
 Name:		gwget
-Version:	1.0.1
-Release:	6%{?dist}
+Version:	1.0.2
+Release:	1%{?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.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/1.0/gwget-%{version}.tar.bz2
+Patch0:		gwget-epiphany-webkit.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -24,22 +25,16 @@ BuildRequires:	desktop-file-utils
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 BuildRequires:	epiphany-devel >= %{epimajor}
 %endif
 
-# disable epiphany extension for mass rebuild
-Obsoletes:	gwget-epiphany-extension <= 1.0.1-4
-
-# Was a buildreq on autoconf
-BuildRequires:	automake, libtool
-
 %description
 Gwget is a Download Manager for Gnome 2. It uses wget as a backend.
 Currently, very basic wget options are available, supporting multiple
 downloads, drag&drop and display the errors from wget process.
 
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 %package	epiphany-extension
 Summary:	Gwget2 extensions for epiphany
 Group:		Applications/Internet
@@ -48,7 +43,7 @@ Requires:	%{name} = %{version}
 Requires:	epiphany >= %{epimajor}
 
 %description epiphany-extension
-This package contains gwget2 extensions for epiphany.
+This package contains gwget2 extensions for the epiphany webbrowser.
 %endif
 
 %prep
@@ -63,11 +58,13 @@ done
 
 
 %build
-#intltoolize -f
-aclocal
-libtoolize -f
-autoreconf -f
-%configure --disable-static
+%configure --disable-static \
+%if 0%{?_with_epiphany:1}
+    --enable-epiphany-extension
+%else
+    --disable-epiphany-extension
+%endif
+
 make %{?_smp_mflags}
 
 
@@ -75,7 +72,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 desktop-file-install --vendor fedora			\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
@@ -114,7 +111,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/dbus-1/services/org.gnome.gwget.service
 
-%if 0%{?_with_epi} == 1
+%if 0%{?_with_epiphany:1}
 %files epiphany-extension
 %defattr (-,root,root,-)
 %{_libdir}/epiphany/*/extensions/gwget.xml
@@ -123,6 +120,11 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 
 
 %changelog
+* Fri Aug 14 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2
+- Patch to enable epiphany extension again (Vincent Untz)
+- No need to run any autotools any longer
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Feb 2009 02:44:00 -0000	1.12
+++ sources	14 Aug 2009 03:21:34 -0000	1.13
@@ -1 +1 @@
-780d2d8569032cbc4405b88c33e431cc  gwget-1.0.1.tar.bz2
+52b518ea58b3bd618db0c58910ee5ccc  gwget-1.0.2.tar.bz2


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


