Hello community, here is the log from the commit of package planner for openSUSE:Factory checked in at 2012-12-19 11:49:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/planner (Old) and /work/SRC/openSUSE:Factory/.planner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "planner", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/planner/planner.changes 2012-08-10 19:02:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.planner.new/planner.changes 2012-12-19 11:49:45.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Dec 17 19:35:28 UTC 2012 - [email protected] + +- Add build_eds defines, set to openSUSE <= 1220 (last version we + had a compatible evolution version). +- If build_eds evaluates to false, then: + + Pass --disable-eds to configure + + Don't create the evolution subpackage + + Obsolete the evolution subpackage from the main package. + else pass --enable-eds to configure. +- Drop xz BuildRequires as it now comes for free in the build + system. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ planner.spec ++++++ --- /var/tmp/diff_new_pack.0AZKcd/_old 2012-12-19 11:49:46.000000000 +0100 +++ /var/tmp/diff_new_pack.0AZKcd/_new 2012-12-19 11:49:46.000000000 +0100 @@ -16,12 +16,13 @@ # +%define build_eds 0%{?suse_version} <= 1220 %define build_eds_backend 0%{?suse_version} <= 1130 Name: planner Version: 0.14.6 Release: 0 -# FIXME: on update to new version, check if we can reenable the eds backend +# FIXME: on update to new version, check if we can reenable eds and the eds backend Summary: Project Management Application for GNOME License: GPL-2.0+ Group: Productivity/Office/Management @@ -31,11 +32,12 @@ Patch0: planner-cmdline.patch # PATCH-FIX-UPSTREAM planner-libgnome.patch bgo#681497 bnc#775189 [email protected] -- Link libsql-plugin to libgnome. Patch1: planner-libgnome.patch +%if %build_eds BuildRequires: evolution-data-server-devel %if %build_eds_backend BuildRequires: evolution-devel %endif -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +%endif BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gtk-doc @@ -47,7 +49,6 @@ BuildRequires: python-devel BuildRequires: python-gtk-devel BuildRequires: scrollkeeper -BuildRequires: xz # We need the %%mime_database_* macros BuildRequires: shared-mime-info BuildRequires: translation-update-upstream @@ -57,6 +58,10 @@ Recommends: %{name}-lang Provides: mrproject Obsoletes: mrproject <= 0.10 +%if ! (%build_eds) +# In case we don't build the evolution sub-package, we need to obsolete it for clean upgrade paths. +Obsoletes: %{name}-evolution <= %{version} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %py_requires @@ -65,6 +70,7 @@ Planner is a project management tool for the GNOME desktop, for planning, scheduling and tracking projects. +%if %build_eds %package evolution Summary: Planner integration with Evolution Group: Productivity/Office/Management @@ -74,6 +80,7 @@ %description evolution Planner is a project management tool for the GNOME desktop, for planning, scheduling and tracking projects. +%endif %package devel Summary: Project Management Application for GNOME @@ -108,7 +115,11 @@ --with-database=auto \ --enable-python \ --enable-python-plugin \ +%if %build_eds --enable-eds \ +%else + --disable-eds \ +%endif %if %build_eds_backend --enable-eds-backend %else @@ -182,6 +193,7 @@ %doc %{_mandir}/man1/planner.1* %exclude %{_libdir}/planner/plugins/libeds-plugin.so +%if %build_eds %files evolution %defattr(-, root, root) %if %build_eds_backend @@ -190,6 +202,7 @@ %{_libdir}/evolution/*/plugins/*.eplug %endif %{_libdir}/planner/plugins/libeds-plugin.so +%endif %files lang -f %{name}.lang -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
