Accepting request 72681 from home:badshah400:misc

Enable building of glade-catalog-anjuta

OBS-URL: https://build.opensuse.org/request/show/72681
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=87

anjuta.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jun  4 09:21:38 UTC 2011 - badshah400@gmail.com
+
+- Enabled building glade-catalog-anjuta for use with glade for
+  gtk+3
+
 -------------------------------------------------------------------
 Mon May 23 23:30:15 CEST 2011 - dimstar@opensuse.org
 

anjuta.spec

@@ -16,8 +16,6 @@
 #
 
 
-%define build_glade_catalog 0
-
 Name:           anjuta
 Version:        3.0.2.0
 Release:        1
@@ -50,9 +48,7 @@ BuildRequires:  valgrind-devel
 %endif
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gdl-3.0)
-%if %{build_glade_catalog}
 BuildRequires:  pkgconfig(gladeui-2.0)
-%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtksourceview-3.0)
@@ -85,17 +81,15 @@ an integrated Valgrind memory profiler, an integrated gprof performance
 profiler, a class generator, a powerful source editor, source browsing,
 and more.
 
-%if %{build_glade_catalog}
-
-%package -n glade3-catalog-anjuta
+%package -n glade-catalog-anjuta
 License:        GPLv2+
 Summary:        Versatile Integrated Development Environment for GNOME -- 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-anjuta
+%description -n glade-catalog-anjuta
 Anjuta is a versatile Integrated Development Environment (IDE) for the
 GNOME desktop. It features a number of advanced programming facilities
 includes project management, application wizards, an interactive
@@ -106,7 +100,7 @@ and more.
 
 This package provides a catalog for Glade, to allow the use the Anjuta
 widgets in Glade.
-%endif
+
 
 %package devel
 License:        GPLv2+
@@ -208,13 +202,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %doc %{_mandir}/man?/*.*
 
-%if %{build_glade_catalog}
-
-%files -n glade3-catalog-anjuta
+%files -n glade-catalog-anjuta
 %defattr(-, root, root)
-%{_libdir}/glade3/modules/libgladeanjuta.so
-%{_datadir}/glade3/catalogs/anjuta-glade.xml
-%endif
+%{_libdir}/glade/modules/libgladeanjuta.so
+%{_datadir}/glade/catalogs/anjuta-glade.xml
 
 %files devel
 %defattr(-, root, root)