Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at Fri Oct 7 00:46:45 CEST 2011.
-------- --- openSUSE:Factory/evolution/evolution.changes 2011-10-02 09:59:27.000000000 +0200 +++ evolution/evolution.changes 2011-10-05 16:17:26.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Oct 5 13:38:54 UTC 2011 - [email protected] + +- Re-enable the build of the glade catalog (bnc#689575): + + Remove the glade_catalog define that was set to 0. + + Rename glade3-catalog-evolution subpackage to + glade-catalog-evolution since it's a catalog for glade, and + not glade3. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.Mq4lEO/_old 2011-10-07 00:46:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Mq4lEO/_new 2011-10-07 00:46:42.000000000 +0200 @@ -17,7 +17,6 @@ %define USE_EVOLDAP 0 -%define glade_catalog 0 # wait for port of gtkimageview to gtk3 %define use_gtkimageview 0 @@ -46,9 +45,7 @@ BuildRequires: pkgconfig(gail) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gio-2.0) -%if %{glade_catalog} BuildRequires: pkgconfig(gladeui-2.0) -%endif BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gnome-icon-theme) BuildRequires: pkgconfig(goa-1.0) @@ -100,18 +97,15 @@ of the modular design, it is possible to plug new components into Evolution or embed the existing ones in other applications. -%if %{glade_catalog} - -%package -n glade3-catalog-evolution - +%package -n glade-catalog-evolution License: LGPLv2.0 ; LGPLv3 Summary: Evolution Library -- Catalog for Glade Group: Development/Tools/GUI Builders Requires: %{name} = %{version} -Requires: glade3 -Supplements: packageand(glade3:%{name}-devel) +Requires: glade +Supplements: packageand(glade:%{name}-devel) -%description -n glade3-catalog-evolution +%description -n glade-catalog-evolution Evolution consists of modular components (at the moment: mailer, calendar, and address book) that should make daily life easier. Because of the modular design, it is possible to plug new components into @@ -119,7 +113,6 @@ This package provides a catalog for Glade, to allow the use of Evolution widgets in Glade. -%endif %package devel License: LGPLv2.0 ; LGPLv3 @@ -201,9 +194,7 @@ --enable-smime=yes \ --enable-mono=yes \ --enable-python=yes \ -%if %{glade_catalog} --with-glade-catalog \ -%endif %if !%{use_gtkimageview} --disable-image-inline \ %endif @@ -318,13 +309,10 @@ %files lang -f evolution-%evolution_base_version.lang -%if %{glade_catalog} - -%files -n glade3-catalog-evolution +%files -n glade-catalog-evolution %defattr(-,root,root) -%{_libdir}/glade3/modules/libgladeevolution.so -%{_datadir}/glade3/catalogs/evolution.xml -%endif +%{_libdir}/glade/modules/libgladeevolution.so +%{_datadir}/glade/catalogs/evolution.xml %files devel %defattr(-,root,root) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
