rpms/gwget/FC-5 gwget-epiphany214.patch, NONE, 1.1 gwget.spec, 1.11, 1.12

Thorsten Leemhuis (thl) fedora-extras-commits at redhat.com
Sun Apr 2 12:11:48 UTC 2006


Author: thl

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany214.patch 
Log Message:
0.97-3 -- - Add LDFLAGS=-Wl,--export-dynamic #187623

gwget-epiphany214.patch:

--- NEW FILE gwget-epiphany214.patch ---
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 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-1.10; then
-               EPHY_VER=1.10
+if 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 @@
           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
+elif test $EPHY_VER = "2.14"; then
+          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
 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
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/gwget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
+++ gwget.spec	2 Apr 2006 12:11:47 -0000	1.12
@@ -1,13 +1,14 @@
-%define epimajor 1.9
+%define epimajor 2.14
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
 Source1:	gwget.desktop
+Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -16,6 +17,7 @@
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	epiphany-devel >= %{epimajor}
+BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -37,9 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
-%configure
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -90,7 +95,11 @@
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
+- Add LDFLAGS="-Wl,--export-dynamic" #187623
+- Add patch from cvs to build against latest epiphany
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-2
 - Rebuild for Fedora Extras 5
 
 * Wed Feb 01 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.97-1




More information about the fedora-extras-commits mailing list