rpms/gwget/devel gwget-epiphany214.patch, 1.2, 1.3 .cvsignore, 1.7, 1.8 gwget.spec, 1.13, 1.14 sources, 1.7, 1.8

Mon Jun 26 21:10:28 UTC 2006

Author: cwickert

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

Modified Files:
	.cvsignore gwget.spec sources 
Added Files:
	gwget-epiphany214.patch 
Log Message:
bump release to fix broken upgrade path

gwget-epiphany214.patch:

Index: gwget-epiphany214.patch
===================================================================
RCS file: gwget-epiphany214.patch
diff -N gwget-epiphany214.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gwget-epiphany214.patch	26 Jun 2006 21:10:27 -0000	1.3
@@ -0,0 +1,33 @@
+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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Jun 2006 00:27:58 -0000	1.7
+++ .cvsignore	26 Jun 2006 21:10:27 -0000	1.8
@@ -1 +1 @@
-gwget-0.98.1.tar.bz2
+gwget-0.97.tar.bz2


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gwget.spec	2 Jun 2006 00:27:58 -0000	1.13
+++ gwget.spec	26 Jun 2006 21:10:27 -0000	1.14
@@ -2,19 +2,18 @@
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
-Version:	0.98.1
-Release:	1%{?dist}
+Version:	0.97
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.98/gwget-0.98.1.tar.bz2
+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
-BuildRequires:	libglade2-devel >= 2.0
+Buildrequires:	libgnomeui-devel >= 2.0
+Buildrequires:	libglade2-devel >= 2.0
 BuildRequires:	perl-XML-Parser
-BuildRequires:	dbus-devel
-BuildRequires:	libnotify-devel
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	autoconf
@@ -36,12 +35,15 @@
 Requires:	epiphany >= %{epimajor}
 
 %description epiphany-extension
-This Package contains extensions gwget2 extensions for epiphany.
+This Package contains gwget2 extensions for epiphany.
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure 
 make %{?_smp_mflags}
 
@@ -77,7 +79,7 @@
 
 
 %files -f %{name}.lang
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/*
 %{_libdir}/bonobo/servers/GNOME_Gwget.server
@@ -88,16 +90,16 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %files epiphany-extension
-%defattr (-,root,root)
+%defattr (-,root,root,-)
 %{_libdir}/epiphany*/
 
 
 %changelog
-* Fri Jun 02 2006 Christoph Wickert <fedora wickert at acror de> - 0.98.1-1
-- Update to 0.98.1
-- Fix description of epiphany-pakage
-- Fix some typos
-- Remove LDFLAGS again, fixed upstream (#187623)
+* Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-4
+- bump release to fix broken upgrade path FE5 -> FE6.
+- fix defattr.
+- fix summary and description of epiphany-extension subpackage.
+- fix BR of epiphany-extension subpackage.
 
 * Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
 - Add LDFLAGS="-Wl,--export-dynamic" #187623


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Jun 2006 00:27:58 -0000	1.7
+++ sources	26 Jun 2006 21:10:27 -0000	1.8
@@ -1 +1 @@
-d09c1b589e2240cb7391d58eb2c8cc83  gwget-0.98.1.tar.bz2
+b31dd63a2b55f1c0c2dea58490ca8cd2  gwget-0.97.tar.bz2


