rpms/gwget/devel gwget-epiphany215.patch, NONE, 1.1 gwget.spec, 1.15, 1.16

Christoph Wickert (cwickert) fedora-extras-commits at redhat.com
Sat Jul 15 14:21:38 UTC 2006


Author: cwickert

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8476

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany215.patch 
Log Message:
Fix BRs for minimal mock environment (#198919)

gwget-epiphany215.patch:

--- NEW FILE gwget-epiphany215.patch ---
--- gwget-0.97/configure.in	2006-07-14 17:03:55.000000000 +0100
+++ gwget-0.97/configure.in	2006-07-14 17:06:34.000000000 +0100
@@ -71,7 +71,9 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.14; then
+if pkg-config --exists epiphany-2.15; then
+        EPHY_VER=2.15
+elif pkg-config --exists epiphany-2.14; then
         EPHY_VER=2.14
 elif pkg-config --exists epiphany-1.10; then
         EPHY_VER=1.10
@@ -113,11 +115,15 @@
           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
+elif test $EPHY_VER = "2.15"; then
+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 215, [Define to the Epiphany version (12 or 14 or 16)])
+          EPIPHANY_PKGCONFIG=epiphany-2.15
+          EPIPHANY_REQUIRED=2.15
 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"  || test $EPHY_VER = "2.14" ; 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" || test $EPHY_VER = "2.15" ; then
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gwget.spec	26 Jun 2006 21:28:22 -0000	1.15
+++ gwget.spec	15 Jul 2006 14:21:38 -0000	1.16
@@ -1,26 +1,28 @@
-%define epimajor 2.14
+%define epimajor 2.15
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	5%{?dist}
+Release:	6%{?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
+Patch1:		gwget-epiphany215.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
 Buildrequires:	libglade2-devel >= 2.0
-BuildRequires:	perl-XML-Parser
+BuildRequires:	perl(XML::Parser)
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
-BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
 
+# Was a buildreq on autoconf
+BuildRequires:	automake, libtool
 
 %description
 Gwget is a Download Manager for Gnome 2. It uses wget as a backend.
@@ -40,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .patch0
+%patch1 -p1 -b .patch1
 autoreconf -f
 
 %build
@@ -95,6 +98,10 @@
 
 
 %changelog
+* Sat Jul 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-6
+- Fix BR to build in minimal build environment (#198919).
+- Add patch to build against epiphany 2.1.5.
+
 * Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-5
 - bump release to fix broken upgrade path FE5 -> FE6.
 




More information about the fedora-extras-commits mailing list