rpms/gwget/devel gwget-epiphany21x.patch, NONE, 1.1 gwget.spec, 1.16, 1.17 gwget-epiphany214.patch, 1.3, NONE gwget-epiphany215.patch, 1.1, NONE

Fri Sep 15 13:41:11 UTC 2006

Author: cwickert

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

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany21x.patch 
Removed Files:
	gwget-epiphany214.patch gwget-epiphany215.patch 
Log Message:
Mass rebuild for Fedora Core 6

gwget-epiphany21x.patch:

--- NEW FILE gwget-epiphany21x.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.16; then
+        EPHY_VER=2.16
+if pkg-config --exists epiphany-2.15; then
+        EPHY_VER=2.15
+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/devel/gwget.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gwget.spec	15 Jul 2006 14:21:38 -0000	1.16
+++ gwget.spec	15 Sep 2006 13:41:11 -0000	1.17
@@ -1,20 +1,21 @@
-%define epimajor 2.15
+%define epimajor 2.16
 
-Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	6%{?dist}
+Release:	7%{?dist}
+Summary:	Graphical download manager that uses wget
+
 License:	GPL
 Group:		Applications/Internet
+URL:		http://gnome.org/projects/gwget
 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
+Patch0:		gwget-epiphany21x.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildrequires:	libgnomeui-devel >= 2.0
-Buildrequires:	libglade2-devel >= 2.0
-BuildRequires:	perl(XML::Parser)
+
+BuildRequires:	libgnomeui-devel >= 2.0
+BuildRequires:	libglade2-devel >= 2.0
+BuildRequires:	intltool >= 0.29
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 Requires:	wget >= 1.9
@@ -42,12 +43,11 @@
 %prep
 %setup -q
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
 autoreconf -f
 
 %build
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
-%configure 
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -56,14 +56,13 @@
 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      \
-  --add-category X-Fedora                              \
-  %{SOURCE1}
+desktop-file-install --vendor fedora			\
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+	--add-category X-Fedora				\
+	%{SOURCE1}
 rm -f ${RPM_BUILD_ROOT}/%{_includedir}/gwget/*
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions/libgwgetextension.a
 
 %clean
 rm -rf %{buildroot}
@@ -72,13 +71,13 @@
 # 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 ||:
+	%{_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`
 /usr/bin/gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 
 
 %files -f %{name}.lang
@@ -98,6 +97,12 @@
 
 
 %changelog
+* Fri Sep 15 2006 Christoph Wickert <fedora at christoph-wickert de> 0.97-7
+- Mass rebuild for Fedora Core 6.
+- Update epiphany-patch for epiphany <= 2.1.6.
+- disable-static instead of removing .a files.
+- BuildRequire intltool instead of perl(XML::Parser).
+
 * 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.
@@ -106,7 +111,7 @@
 - bump release to fix broken upgrade path FE5 -> FE6.
 
 * Mon Jun 26 2006 Christoph Wickert <fedora wickert at arcor de> 0.97-4
-- fix defattr.
+- fix %%defattr.
 - fix summary and description of epiphany-extension subpackage.
 - fix BR of epiphany-extension subpackage.
 


--- gwget-epiphany214.patch DELETED ---


--- gwget-epiphany215.patch DELETED ---


