rpms/gwget/FC-4 .cvsignore, 1.4, 1.5 gwget.spec, 1.6, 1.7 sources, 1.4, 1.5

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	.cvsignore gwget.spec sources 
Log Message:
sync with devel -- update to 0.96, always build epiphany extension and more


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2005 16:56:22 -0000	1.4
+++ .cvsignore	22 Sep 2005 16:41:08 -0000	1.5
@@ -1,2 +1 @@
-gwget-0.93.tar.gz
-gwget-autoreconf.patch.bz2
+gwget-0.96.tar.gz


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-4/gwget.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gwget.spec	5 Mar 2005 21:10:21 -0000	1.6
+++ gwget.spec	22 Sep 2005 16:41:08 -0000	1.7
@@ -1,21 +1,21 @@
-# use "--without epiphanye" as rpmbuildparameter to disable epiphany-extension (requires FC3 Core package)
+%define epimajor 1.6
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
-Version:	0.93
-Release:	2
+Version:	0.96
+Release:	4%{?dist}
 License:	GPL
 Group:		Applications/Internet
-Source0:	http://dl.sf.net/gwget/gwget-0.93.tar.gz
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.96/gwget-0.96.tar.gz
 Source1:	gwget.desktop
-Patch0: 	gwget-autoreconf.patch.bz2
-URL:		http://gwget.sourceforge.net/
+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:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
+BuildRequires:	epiphany-devel >= %{epimajor}
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -26,32 +26,27 @@
 Currently, very basic wget options are available, supporting multiple
 downloads, drag&drop and display the errors from wget process.
 
-%if 0%{!?_without_epiphanye:1}
-
 %package epiphany-extension
 Summary:	This Package contains extensions gwget2 extensions for epiphany.
 Group:		Applications/Internet
 Requires:	%{name} = %{version}
-Requires:	epiphany >= 1.4.4
-BuildRequires:	epiphany-devel >= 1.4.4
+Requires:	epiphany >= %{epimajor}
 
 %description epiphany-extension
 This Package contains extensions gwget2 extensions for epiphany.
-%endif # _without_epiphanye
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure %{?_without_epiphanye:--disable-epiphany-extension}
+%configure --with-epiphany-version=%{epimajor}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora                   \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
@@ -89,16 +84,29 @@
 %{_datadir}/idl/GNOME_Gwget.idl
 %{_datadir}/applications/fedora-%{name}.desktop
 
-%if 0%{!?_without_epiphanye:1}
 %files epiphany-extension
 %defattr (-,root,root)
-%dir %{_libdir}/epiphany/extensions/
-%{_libdir}/epiphany/extensions/*
-%endif # _without_epiphanye
-
+%{_libdir}/epiphany*/
 
 
 %changelog
+* Thu Sep 22 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.96-4
+- extension-dir is different on epiphany 1.8
+- Own _libdir/epiphany
+
+* Thu Sep 22 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.96-3
+- use dist
+
+* Mon Sep 19 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.96-2
+- Remove the epiphanye build-option and build it always
+- Use epimajor macro to simplify spec for different dists
+- make install DESTDIR= instead of makeinstall macro
+
+* Mon Sep 19 2005 Adel Gadllah <adel.gadllah [AT] gmail [DOT] com> 0.96-1
+- Update to 0.96 
+- Fix urls in spec file (project has moved)
+- dropped x86_64 patch (not needed anymore)
+
 * Tue Mar 01 2005 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0:0.93-2
 - Add gwget-autoreconf.patch.bz2 ; fixes x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2005 16:56:37 -0000	1.4
+++ sources	22 Sep 2005 16:41:08 -0000	1.5
@@ -1,2 +1 @@
-79a3625ef99a5a417164e0d97020fcc5  gwget-0.93.tar.gz
-159d5d2c94c0bb88a82cdfdb2ecbe0d2  gwget-autoreconf.patch.bz2
+f4c78534574300ce7997e9fdc3c3b6be  gwget-0.96.tar.gz