rpms/gwget/devel gwget-1.00-epiphany.patch, NONE, 1.1 gwget-1.00-gnome-cflags.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gwget.spec, 1.27, 1.28 sources, 1.10, 1.11 gwget-0.99-epiphany.patch, 1.4, NONE gwget-0.99-missing-remove-signal.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Sun Feb 15 23:03:16 UTC 2009
Author: cwickert
Update of /cvs/pkgs/rpms/gwget/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14084
Modified Files:
.cvsignore gwget.spec sources
Added Files:
gwget-1.00-epiphany.patch gwget-1.00-gnome-cflags.patch
Removed Files:
gwget-0.99-epiphany.patch
gwget-0.99-missing-remove-signal.patch
Log Message:
* Sun Feb 15 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.00
- Update to 1.00
- Drop missing-remove-signal.patch, fixed upstream
- Drop gnome-vfs2-devel as local operations are now performed with gio
- No longer own %{_libdir}/epiphany*/ after #479921 has been fixed
- Update epiphany patch for epiphany <= 2.26
gwget-1.00-epiphany.patch:
--- NEW FILE gwget-1.00-epiphany.patch ---
diff -dur gwget-1.00.orig/configure gwget-1.00/configure
--- gwget-1.00.orig/configure 2009-02-12 20:31:13.000000000 +0100
+++ gwget-1.00/configure 2009-02-14 23:59:46.000000000 +0100
@@ -1556,9 +1556,10 @@
Config database for installing schema files.
--with-gconf-schema-file-dir=dir
Directory for installing schema files.
- --with-epiphany-version[=1.6|1.8|1.10|2.14]
+ --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 (default 1.6)
+ or 2.14 or 2.16 or 2.18 or 2.20 or 2.22 or 2.24
+ or 2.26 (default 1.6)
--with-extension-prefix=path Epiphany extension prefix
Some influential environment variables:
@@ -14392,8 +14393,24 @@
EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
- EPHY_VER=2.18
+if pkg-config --exists epiphany-2.26; then
+ EPHY_VER=2.26
+elif pkg-config --exists epiphany-2.25; then
+ EPHY_VER=2.25
+elif pkg-config --exists epiphany-2.24; then
+ EPHY_VER=2.24
+elif pkg-config --exists epiphany-2.23; then
+ EPHY_VER=2.23
+elif pkg-config --exists epiphany-2.22; then
+ EPHY_VER=2.22
+elif pkg-config --exists epiphany-2.21; then
+ EPHY_VER=2.21
+elif pkg-config --exists epiphany-2.20; then
+ EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+ EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+ EPHY_VER=2.18
elif pkg-config --exists epiphany-2.17; then
EPHY_VER=2.17
elif pkg-config --exists epiphany-2.16; then
@@ -14459,6 +14476,38 @@
EPIPHANY_PKGCONFIG=epiphany-2.18
EPIPHANY_REQUIRED=2.18
EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.19
+ EPIPHANY_REQUIRED=2.19
+ EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.20
+ EPIPHANY_REQUIRED=2.20
+ EPIPHANY_SHORTVER=220
+elif test "x$EPHY_VER" = "x2.21"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.21
+ EPIPHANY_REQUIRED=2.21
+ EPIPHANY_SHORTVER=221
+elif test "x$EPHY_VER" = "x2.22"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.22
+ EPIPHANY_REQUIRED=2.22
+ EPIPHANY_SHORTVER=222
+elif test "x$EPHY_VER" = "x2.23"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.23
+ EPIPHANY_REQUIRED=2.23
+ EPIPHANY_SHORTVER=223
+elif test "x$EPHY_VER" = "x2.24"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.24
+ EPIPHANY_REQUIRED=2.24
+ EPIPHANY_SHORTVER=224
+elif test "x$EPHY_VER" = "x2.25"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.25
+ EPIPHANY_REQUIRED=2.25
+ EPIPHANY_SHORTVER=225
+elif test "x$EPHY_VER" = "x2.18"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.26
+ EPIPHANY_REQUIRED=2.26
+ EPIPHANY_SHORTVER=226
else
{ echo "$as_me:$LINENO: result: no epiphany installed" >&5
echo "${ECHO_T}no epiphany installed" >&6; }
diff -dur gwget-1.00.orig/configure.ac gwget-1.00/configure.ac
--- gwget-1.00.orig/configure.ac 2009-02-12 20:30:56.000000000 +0100
+++ gwget-1.00/configure.ac 2009-02-14 23:59:40.000000000 +0100
@@ -98,14 +98,30 @@
EPHY_VER=
AC_ARG_WITH([epiphany-version],
- AC_HELP_STRING([--with-epiphany-version@<:@=1.6|1.8|1.10|2.14@:>@],
- [Whether to use epiphany version 1.6 or 1.8 or 1.10 or 2.14 (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@:>@],
+ [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)]),
[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 or 2.18
+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
EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-2.18; then
- EPHY_VER=2.18
+if pkg-config --exists epiphany-2.26; then
+ EPHY_VER=2.26
+elif pkg-config --exists epiphany-2.25; then
+ EPHY_VER=2.25
+elif pkg-config --exists epiphany-2.24; then
+ EPHY_VER=2.24
+elif pkg-config --exists epiphany-2.23; then
+ EPHY_VER=2.23
+elif pkg-config --exists epiphany-2.22; then
+ EPHY_VER=2.22
+elif pkg-config --exists epiphany-2.21; then
+ EPHY_VER=2.21
+elif pkg-config --exists epiphany-2.20; then
+ EPHY_VER=2.20
+elif pkg-config --exists epiphany-2.19; then
+ EPHY_VER=2.19
+elif pkg-config --exists epiphany-2.18; then
+ EPHY_VER=2.18
elif pkg-config --exists epiphany-2.17; then
EPHY_VER=2.17
elif pkg-config --exists epiphany-2.16; then
@@ -171,13 +187,45 @@
EPIPHANY_PKGCONFIG=epiphany-2.18
EPIPHANY_REQUIRED=2.18
EPIPHANY_SHORTVER=218
+elif test "x$EPHY_VER" = "x2.19"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.19
+ EPIPHANY_REQUIRED=2.19
+ EPIPHANY_SHORTVER=219
+elif test "x$EPHY_VER" = "x2.20"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.20
+ EPIPHANY_REQUIRED=2.20
+ EPIPHANY_SHORTVER=220
+elif test "x$EPHY_VER" = "x2.21"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.21
+ EPIPHANY_REQUIRED=2.21
+ EPIPHANY_SHORTVER=221
+elif test "x$EPHY_VER" = "x2.22"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.22
+ EPIPHANY_REQUIRED=2.22
+ EPIPHANY_SHORTVER=222
+elif test "x$EPHY_VER" = "x2.23"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.23
+ EPIPHANY_REQUIRED=2.23
+ EPIPHANY_SHORTVER=223
+elif test "x$EPHY_VER" = "x2.24"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.24
+ EPIPHANY_REQUIRED=2.24
+ EPIPHANY_SHORTVER=224
+elif test "x$EPHY_VER" = "x2.25"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.25
+ EPIPHANY_REQUIRED=2.25
+ EPIPHANY_SHORTVER=225
+elif test "x$EPHY_VER" = "x2.18"; then
+ EPIPHANY_PKGCONFIG=epiphany-2.26
+ EPIPHANY_REQUIRED=2.26
+ EPIPHANY_SHORTVER=226
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, or 215)])
+ [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_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
LIBGLIB_REQUIRED=2.4.0
gwget-1.00-gnome-cflags.patch:
--- NEW FILE gwget-1.00-gnome-cflags.patch ---
--- trunk/epiphany-extension/Makefile.am 2006/05/13 17:14:07 461
+++ trunk/epiphany-extension/Makefile.am 2009/02/15 15:06:11 625
@@ -11,7 +11,8 @@
-DEPHY_EXTENSIONS_LOCALEDIR=\"$(datadir)/locale\" \
-I$(top_srcdir)/src \
$(DBUS_CFLAGS) \
- -I$(top_builddir)/include
+ -I$(top_builddir)/include \
+ @GNOME_CFLAGS@
libgwgetextension_la_SOURCES = \
ephy-gwget.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 9 Jun 2007 20:02:43 -0000 1.10
+++ .cvsignore 15 Feb 2009 23:02:46 -0000 1.11
@@ -1 +1 @@
-gwget-0.99.tar.bz2
+gwget-1.00.tar.bz2
Index: gwget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gwget.spec 30 Aug 2008 14:32:23 -0000 1.27
+++ gwget.spec 15 Feb 2009 23:02:46 -0000 1.28
@@ -1,25 +1,25 @@
-%define epimajor 2.23
+%define epimajor 2.25
Name: gwget
-Version: 0.99
-Release: 8%{?dist}
+Version: 1.00
+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/0.99/gwget-0.99.tar.bz2
-Source1: gwget.desktop
-Patch0: gwget-0.99-epiphany.patch
-Patch1: gwget-0.99-missing-remove-signal.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gwget/%{version}/gwget-%{version}.tar.bz2
+# http://bugzilla.gnome.org/show_bug.cgi?id=571789
+Patch0: gwget-1.00-epiphany.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=571790
+Patch1: gwget-1.00-gnome-cflags.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel >= 2.0
BuildRequires: libglade2-devel >= 2.0
-BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: dbus-devel
BuildRequires: libnotify-devel
-BuildRequires: intltool >= 0.29
+BuildRequires: intltool >= 0.35.0
BuildRequires: gettext >= 0.14.1
BuildRequires: desktop-file-utils
Requires: wget >= 1.9
@@ -34,6 +34,7 @@
Currently, very basic wget options are available, supporting multiple
downloads, drag&drop and display the errors from wget process.
+
%package epiphany-extension
Summary: Gwget2 extensions for epiphany
Group: Applications/Internet
@@ -44,46 +45,54 @@
%description epiphany-extension
This Package contains gwget2 extensions for epiphany.
+
%prep
%setup -q
%patch0 -p1 -b .epiphany
-%patch1 -p0 -b .missing-signals
-iconv -f ISO-8859-1 -t UTF-8 < ChangeLog > ChangeLog.utf8 && \
- mv ChangeLog.utf8 ChangeLog
-iconv -f ISO-8859-1 -t UTF-8 < README > README.utf8 && \
- mv README.utf8 README
+%patch1 -p1 -b .gnome-cflags
+# convert files to UTF-8 with preserving the timestamps
+for file in ChangeLog README; do
+ mv $file timestamp
+ iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp
+ touch -r timestamp $file
+done
%build
-intltoolize -f
+#intltoolize -f
+aclocal
+libtoolize -f
autoreconf -f
-#export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
%configure --disable-static
-
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
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 \
- %{SOURCE1}
-rm -f ${RPM_BUILD_ROOT}/%{_includedir}/gwget/*
+ --delete-original \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+
%find_lang %{name}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
%clean
rm -rf %{buildroot}
+
%post
# For GConf apps: install schemas as system default
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
/usr/bin/gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
+
%preun
# For GConf apps: uninstall app's system default schemas
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -103,66 +112,74 @@
%files epiphany-extension
%defattr (-,root,root,-)
-%{_libdir}/epiphany*/
+%{_libdir}/epiphany/*/extensions/gwget.xml
+%{_libdir}/epiphany/*/extensions/libgwgetextension.so
%changelog
-* Sat Aug 30 2008 Christoph Wickert <fedora christoph-wickert de> - 0.99-8
+* Sun Feb 15 2009 Christoph Wickert <cwickert at fedoraproject.org> - 1.00
+- Update to 1.00
+- Drop missing-remove-signal.patch, fixed upstream
+- Drop gnome-vfs2-devel as local operations are now performed with gio
+- No longer own %%{_libdir}/epiphany*/ after #479921 has been fixed
+- Update epiphany patch for epiphany <= 2.26
+
+* Sat Aug 30 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-8
- Rebuild against epiphany 2.23 and already prepare for 2.24
-* Thu Jun 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.99-7
+* Thu Jun 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-7
- Fix for latest epiphany (#440744)
- Add Debian patch to fix missing remove signals
-* Sat Apr 05 2008 Christoph Wickert <fedora christoph-wickert de> - 0.99-6
+* Sat Apr 05 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-6
- Build against epiphany 2.22
- Remove the obsolte category Application from desktop file
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.99-5
- Autorebuild for GCC 4.3
-* Tue Jan 08 2008 Christoph Wickert <fedora christoph-wickert de> - 0.99-4
+* Tue Jan 08 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-4
- Build against epiphany 2.21
-* Wed Sep 26 2007 Christoph Wickert <fedora christoph-wickert de> - 0.99-3
+* Wed Sep 26 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-3
- Build against epiphany 2.20
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.99-2
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-2
- Run intltoolize to get locales installed properly with intltool 0.36.1
- Update license tag
-* Sat Jun 09 2007 Christoph Wickert <fedora christoph-wickert de> - 0.99-1
+* Sat Jun 09 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.99-1
- Update to 0.99
- Add support for epiphany 2.19
- Update desktop file
-* Thu May 17 2007 Christoph Wickert <fedora christoph-wickert de> - 0.98.2-2
+* Thu May 17 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-2
- Rebuild for Fedora 7
- Add support for epiphany 2.18
-* Sat Nov 11 2006 Christoph Wickert <fedora christoph-wickert de> - 0.98.2-1
+* Sat Nov 11 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.2-1
- Update to 0.98.2.
- Don't crash notification area (#213480).
- Add support for epiphany 2.17.
-* Fri Sep 15 2006 Christoph Wickert <fedora christoph-wickert de> - 0.98.1-1
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.98.1-1
- Update to 0.98.1.
- BuildRequire dbus-devel, libnotify-devel and gnome-vfs2-devel.
-* Fri Sep 15 2006 Christoph Wickert <fedora christoph-wickert de> - 0.97-7
+* Fri Sep 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-7
- Mass rebuild for Fedora Core 6.
- Update epiphany-patch for epiphany <= 2.16.
- disable-static instead of removing .a files.
- BuildRequire intltool instead of perl(XML::Parser).
-* Sat Jul 15 2006 Christoph Wickert <fedora christoph-wickert de> - 0.97-6
+* Sat Jul 15 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-6
- Fix BR to build in minimal build environment (#198919).
- Add patch to build against epiphany 2.15.
-* Mon Jun 26 2006 Christoph Wickert <fedora christoph-wickert de> - 0.97-5
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-5
- bump release to fix broken upgrade path FE5 -> FE6.
-* Mon Jun 26 2006 Christoph Wickert <fedora christoph-wickert de> - 0.97-4
+* Mon Jun 26 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.97-4
- fix %%defattr.
- fix summary and description of epiphany-extension subpackage.
- fix BR of epiphany-extension subpackage.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gwget/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 9 Jun 2007 20:02:43 -0000 1.10
+++ sources 15 Feb 2009 23:02:46 -0000 1.11
@@ -1 +1 @@
-69f43ae6edbb7ac472c30c547fbf80e6 gwget-0.99.tar.bz2
+0d2b393463889894678773004272902f gwget-1.00.tar.bz2
--- gwget-0.99-epiphany.patch DELETED ---
--- gwget-0.99-missing-remove-signal.patch DELETED ---
More information about the fedora-extras-commits
mailing list