Accepting request 86851 from home:vuntz:branches:GNOME:Factory

Re-enable glade catalog

OBS-URL: https://build.opensuse.org/request/show/86851
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=139

evolution.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Oct  5 13:38:54 UTC 2011 - vuntz@opensuse.org
+
+- 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.
+
 -------------------------------------------------------------------
 Sun Sep 25 23:05:22 UTC 2011 - vuntz@opensuse.org
 

evolution.spec

@@ -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(atk)
 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 @@ calendar, and address book) that should make daily life easier. Because
 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 @@ Evolution or embed the existing ones in other applications.
 
 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 @@ intltoolize --copy --force
     --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 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 
 %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)