Hello community, here is the log from the commit of package epiphany-extensions checked in at Wed Jan 10 18:09:51 CET 2007. -------- --- GNOME/epiphany-extensions/epiphany-extensions.changes 2006-12-05 17:13:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/epiphany-extensions/epiphany-extensions.changes 2007-01-10 17:22:50.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 10 17:22:42 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- +Sat Dec 30 09:49:05 GMT 2006 - james@usr-local-bin.org + +- Change prefix to /usr. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-extensions.spec ++++++ --- /var/tmp/diff_new_pack.sx4895/_old 2007-01-10 18:07:14.000000000 +0100 +++ /var/tmp/diff_new_pack.sx4895/_new 2007-01-10 18:07:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package epiphany-extensions (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,11 +12,11 @@ Name: epiphany-extensions %define xulrunner_version 181 -BuildRequires: epiphany epiphany-devel gcc-c++ gnome-common gnome-doc-utils-devel gnutls-devel gtk2 intltool libgnomeprintui-devel libwnck-devel libxml2-python mDNSResponder-devel mozilla-xulrunner181-devel opensp-devel perl-XML-Parser python-devel scrollkeeper update-desktop-files +BuildRequires: docbook_4 epiphany epiphany-devel gcc-c++ gnome-common gnome-doc-utils-devel gnutls-devel gtk2 intltool libgnomeprintui-devel libwnck-devel libxml2-python mDNSResponder-devel mozilla-xulrunner181-devel opensp-devel perl-XML-Parser python-devel scrollkeeper update-desktop-files Version: 2.16.1 -Release: 29 +Release: 40 URL: http://www.gnome.org/projects/epiphany/ -Prefix: /opt/gnome +Prefix: %{_prefix} Group: Productivity/Networking/Web/Browsers License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Extensions Collection for Epiphany @@ -26,15 +26,24 @@ Obsoletes: epiphany-plugins %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel +%if 0%{?opensuse_bs} +BuildRequires: pkg-config +%endif %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) Requires: mozilla-xulrunner%{xulrunner_version} = %{mozilla_ver} %else %if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk +%if 0%{?opensuse_bs} +BuildRequires: pkg-config +%endif %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner) Requires: mozilla-xulrunner = %{mozilla_ver} %else BuildRequires: mozilla-devel +%if 0%{?opensuse_bs} +BuildRequires: pkg-config +%endif %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla) Requires: mozilla = %{mozilla_ver} %endif @@ -55,34 +64,23 @@ Lee Willis %prep -%setup +%setup -q %build # Disable dashboard extension and keep all others (--without-extensions=dashboard): sed -i 's/\(_EXTENSIONS=.*\) dashboard /\1 /' configure.ac -libtoolize --force --copy -intltoolize --force --copy -aclocal -I m4 -automake --add-missing -autoconf -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS" -./configure\ - --prefix=%prefix \ - --libexecdir=%prefix/%{_lib} \ - --sysconfdir=/etc/%prefix \ - --localstatedir=/var/%prefix \ - --libdir=%prefix/%{_lib} \ - --with-extensions=all \ - --enable-compile-warnings=yes \ +autoreconf -f -i +%configure\ + --with-extensions=all\ + --enable-compile-warnings=yes\ --disable-scrollkeeper -make +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name}-2.16 -rm $RPM_BUILD_ROOT%prefix/%{_lib}/epiphany/2.16/extensions/*.*a +%find_lang %{name} %{name}-2.16.lang +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a %clean rm -rf $RPM_BUILD_ROOT @@ -90,21 +88,15 @@ %files -f %{name}-2.16.lang %defattr (-, root, root) %doc AUTHORS COPYING COPYING.README ChangeLog NEWS README TODO -#%prefix/%{_lib}/epiphany/2.16/extensions/*.xml -#%prefix/%{_lib}/epiphany/2.16/extensions/*.so.* -%prefix/%{_lib}/epiphany/2.16/extensions/*.so -%prefix/%{_lib}/epiphany/2.16/extensions/*.py* -%prefix/%{_lib}/epiphany/2.16/extensions/*extension -%prefix/share/epiphany-extensions -%dir %prefix/share/gnome/help/epiphany-extensions -%dir %prefix/share/gnome/help/epiphany-extensions/C -%dir %prefix/share/gnome/help/epiphany-extensions/C/figures -%dir %prefix/share/omf/epiphany-extensions -%prefix/share/omf/epiphany-extensions/* -%prefix/share/gnome/help/epiphany-extensions/C/figures/* -%prefix/share/gnome/help/epiphany-extensions/C/* +%{_datadir}/epiphany-extensions +%{_datadir}/omf/epiphany-extensions +%{_libdir}/epiphany/2.16/extensions/* %changelog -n epiphany-extensions +* Wed Jan 10 2007 - sbrabec@suse.cz +- Spec file cleanup. +* Sat Dec 30 2006 - james@usr-local-bin.org +- Change prefix to /usr. * Fri Dec 01 2006 - sbrabec@suse.cz - Fixed xulrunner dependencies for older products. * Tue Nov 07 2006 - sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org