Hello community, here is the log from the commit of package gnome-mag for openSUSE:Factory checked in at Mon May 30 15:59:13 CEST 2011. -------- --- GNOME/gnome-mag/gnome-mag.changes 2011-02-13 17:24:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-mag/gnome-mag.changes 2011-05-27 01:03:39.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 27 00:57:40 CEST 2011 - vuntz@opensuse.org + +- Make the gnome-python-desktop, python-gnome-devel, + python-gobject2-devel, python-gtk-devel BuildRequires optional, + following the build_applet define. Those build dependencies are + only needed for the applet. + +------------------------------------------------------------------- +Thu May 5 14:16:26 UTC 2011 - dimstar@opensuse.org + +- Introduce build_applet define, to easily enable/disable the build + of the gnome-applets-colorblind subpackage. This applet requires + the gnomeapplet python module, which requires libpanel-applet-2; + with GNOME 3, this is library, and therefore, the python module + are gone. +- Add a gnome-applets-colorblind Obsoletes to gnome-mag if we don't + build the subpackage, for a reasonable behavior on upgrade. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mag.spec ++++++ --- /var/tmp/diff_new_pack.2Et8a9/_old 2011-05-30 15:56:19.000000000 +0200 +++ /var/tmp/diff_new_pack.2Et8a9/_new 2011-05-30 15:56:19.000000000 +0200 @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +# requires libpanel-applet-2. This library is gone with GNOME 3. +%define build_applet 0 Name: gnome-mag BuildRequires: at-spi-devel @@ -24,24 +25,31 @@ BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gconf2-devel -BuildRequires: gnome-python-desktop BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libbonobo-devel +BuildRequires: translation-update-upstream +BuildRequires: update-desktop-files +%if 0%{?build_applet} +BuildRequires: gnome-python-desktop BuildRequires: python-gnome-devel BuildRequires: python-gobject2-devel BuildRequires: python-gtk-devel -BuildRequires: translation-update-upstream -BuildRequires: update-desktop-files +%endif License: LGPLv2.1+ Group: System/GUI/GNOME Version: 0.16.3 -Release: 2 +Release: 7 +# TODO: if there's ever a new upstream version, check if build_applet can be re-enabled Summary: GNOME Screen Magnifier Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mag/0.13/%{name}-%{version}.tar.bz2 Url: http://developer.gnome.org/projects/gap Recommends: %{name}-lang +%if 0%{?build_applet} Recommends: gnome-applets-colorblind +%else +Obsoletes: gnome-applets-colorblind <= %{version} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +70,8 @@ although its primary goal is to provide a set of magnification services for use by other client applications and assistive technologies. +%if 0%{?build_applet} + %package -n gnome-applets-colorblind License: LGPLv2.1+ Group: System/GUI/GNOME @@ -76,15 +86,21 @@ %description -n gnome-applets-colorblind This packages provides an applet to control image filters for colorblind people. +%endif %lang_package + %prep %setup -q translation-update-upstream %build -### autoreconf -f -i -%configure --disable-static +%configure --disable-static \ +%if 0%{?build_applet} + --enable-colorblind-applet +%else + --disable-colorblind-applet +%endif make %{?jobs:-j%jobs} referencetopdir=%{_docdir}/%{name}/reference %install @@ -93,9 +109,11 @@ %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif cp AUTHORS COPYING ChangeLog NEWS README $RPM_BUILD_ROOT%{_docdir}/%{name} +%if 0%{?build_applet} %def_gconf_schemas colorblind-applet %add_gconf_schemas colorblind-applet %end_gconf_schemas +%endif %find_lang %{name} %{?no_lang_C} find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %fdupes $RPM_BUILD_ROOT @@ -107,6 +125,8 @@ %postun -p /sbin/ldconfig +%if 0%{?build_applet} + %pre -n gnome-applets-colorblind -f colorblind-applet.schemas_pre %post -n gnome-applets-colorblind @@ -118,6 +138,7 @@ %postun -n gnome-applets-colorblind %icon_theme_cache_postun +%endif %files %defattr (-, root, root) @@ -145,6 +166,8 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%if 0%{?build_applet} + %files -n gnome-applets-colorblind -f colorblind-applet.schemas_list %defattr (-, root, root) %{_datadir}/colorblind/ @@ -152,5 +175,6 @@ %{_libdir}/bonobo/servers/GNOME_Magnifier_ColorblindApplet.server %{_libdir}/colorblind-applet/ %{py_sitedir}/colorblind/ +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org