SPECS (AC-branch): epiphany-extensions.spec - merged from HEAD for...

Wed May 17 15:25:41 CEST 2006

Author: baggins                      Date: Wed May 17 13:25:41 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD for GNOME 2.14

---- Files affected:
SPECS:
   epiphany-extensions.spec (1.47 -> 1.47.2.1) 

---- Diffs:

================================================================
Index: SPECS/epiphany-extensions.spec
diff -u SPECS/epiphany-extensions.spec:1.47 SPECS/epiphany-extensions.spec:1.47.2.1

--- SPECS/epiphany-extensions.spec:1.47	Wed Feb  8 18:26:22 2006
+++ SPECS/epiphany-extensions.spec	Wed May 17 15:25:36 2006
@@ -1,38 +1,40 @@
 # $Revision$, $Date$
-# Conditinal build:
-%bcond_with	mozilla_firefox	# build with mozilla-firefox-devel
 #
+# Conditional build:
+%bcond_without	mozilla_firefox	# build with mozilla-firefox-devel
+#
+%define		basever	2.14
 Summary:	Collection of extensions for Epiphany
 Summary(pl):	Zbiór rozszerzeń dla Epiphany
 Name:		epiphany-extensions
-Version:	1.8.2
-Release:	2
+Version:	2.14.1
+Release:	3
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	318418ce023ef5688e535309012591d9
-Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-mozilla_includes.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	8be9c522284b0a9d7ba2797e141cf26e
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake
-BuildRequires:	epiphany-devel >= 1.8.2
-BuildRequires:	gnome-common >= 2.8.0
+BuildRequires:	automake >= 1.9
+BuildRequires:	dbus-glib-devel >= 0.34
+BuildRequires:	epiphany-devel >= 2.14.1
+BuildRequires:	gnome-common >= 2.12.0
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.19
+BuildRequires:	libxml2-devel >= 1:2.6.22
 %if %{with mozilla_firefox}
 BuildRequires:	mozilla-firefox-devel
 %else
 BuildRequires:	mozilla-devel >= 5:1.7
 %endif
 BuildRequires:	opensp-devel
+BuildRequires:	pcre-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.11.3
-BuildRequires:	rpm-pythonprov
+BuildRequires:	python-gnome-devel >= 2.14.0
+Requires(post,postun):	scrollkeeper
 Requires:	epiphany = %(rpm -q --qf '%{EPOCH}:%{VERSION}' epiphany-devel)
 %if %{with mozilla_firefox}
 %requires_eq	mozilla-firefox
@@ -54,19 +56,17 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-
-mv po/{no,nb}.po
 
 %build
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__intltoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-extensions=all
+	--with-extensions=really-all \
+	--disable-scrollkeeper
 %{__make}
 
 %install
@@ -75,20 +75,29 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/1.8/extensions/*.{la,py}
+rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/extensions/*.{la,py}
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
-%find_lang %{name}-1.8
+%find_lang %{name}-%{basever}
+%find_lang %{name} --with-gnome
+cat %{name}.lang >> %{name}-%{basever}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-1.8.lang
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
+
+%files -f %{name}-%{basever}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/epiphany/1.8/extensions/*.so*
-%{_libdir}/epiphany/1.8/extensions/*.py[co]
-%{_libdir}/epiphany/1.8/extensions/*.xml
+%attr(755,root,root) %{_libdir}/epiphany/%{basever}/extensions/*.so*
+%{_libdir}/epiphany/%{basever}/extensions/[!l]*
 %{_datadir}/%{name}
+%{_omf_dest_dir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -96,6 +105,54 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47.2.1  2006/05/17 13:25:36  baggins
+- merged from HEAD for GNOME 2.14
+
+Revision 1.56  2006/05/05 15:01:40  wrobell
+- rel. 3 to rebuild with mozilla firefox 1.5.0.3
+
+Revision 1.55  2006/04/17 16:30:02  wrobell
+- build with firefox by default
+- rel. 2
+
+Revision 1.54  2006/04/13 07:19:35  qboosh
+- missing dir, typo
+
+Revision 1.53  2006/04/12 17:02:08  freetz
+- enable really all extensions, updated build requirement
+
+Revision 1.52  2006/04/12 16:53:03  freetz
+- hopefully last merge breakage - md5 fixed
+
+Revision 1.51  2006/04/12 16:47:00  freetz
+- fixed source0
+
+Revision 1.50  2006/04/12 16:44:07  freetz
+- post merge restore
+
+Revision 1.49  2006/04/12 16:36:00  freetz
+- merged from DEVEL
+
+Revision 1.42.2.5  2006/04/12 16:34:21  freetz
+- 2.14.1, added scrollkeeper documentation and (un)registration, updated
+  file list and BR
+
+Revision 1.42.2.4  2006/03/12 21:03:39  freetz
+- 2.14.0.1, define and use basever
+
+Revision 1.42.2.3  2006/02/14 08:56:24  freetz
+- 1.9.7, removed obsoleted m4 patch
+
+Revision 1.42.2.2  2006/02/01 18:30:19  freetz
+- 1.9.6, m4 fix added
+
+Revision 1.42.2.1  2005/10/25 21:17:36  paladine
+- updated to 1.9.1
+- removed mozilla_includes patch (fixed in sources)
+
+Revision 1.48  2006/02/15 07:25:02  freetz
+- release 3 for rebuild with epiphany 1.8.5
+
 Revision 1.47  2006/02/08 17:26:22  freetz
 - rel.2 for rebuild with ephy 1.8.4.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/epiphany-extensions.spec?r1=1.47&r2=1.47.2.1&f=u

