Hello community,

here is the log from the commit of package gtksourceview for openSUSE:Factory
checked in at Fri Oct 7 10:30:53 CEST 2011.



--------
--- openSUSE:Factory/gtksourceview/gtksourceview.changes        2011-10-02 
10:11:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/gtksourceview/gtksourceview.changes    
2011-10-05 14:53:04.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Oct  5 12:51:37 UTC 2011 - [email protected]
+
+- Re-enable the build of the glade catalog (bnc#689575):
+  + Remove the enable_glade_catalog define that was set to 0.
+  + Change libgladeui-1_0-devel BuildRequires to
+    pkgconfig(gladeui-2.0).
+  + Rename glade3-catalog-gtksourceview subpackage to
+    glade-catalog-gtksourceview since it's a catalog for glade, and
+    not glade3.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gtksourceview.spec ++++++
--- /var/tmp/diff_new_pack.Rd5ARa/_old  2011-10-07 10:30:38.000000000 +0200
+++ /var/tmp/diff_new_pack.Rd5ARa/_new  2011-10-07 10:30:38.000000000 +0200
@@ -16,7 +16,6 @@
 #
 
 
-%define enable_glade_catalog 0
 
 Name:           gtksourceview
 Version:        3.2.0
@@ -29,11 +28,9 @@
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
-%if %{enable_glade_catalog}
-BuildRequires:  libgladeui-1_0-devel
-%endif
 BuildRequires:  libxml2-devel
 BuildRequires:  translation-update-upstream
+BuildRequires:  pkgconfig(gladeui-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -59,18 +56,15 @@
 It improves GtkTextView by implementing syntax highlighting and other
 features typical of a source editor.
 
-%if %{enable_glade_catalog}
-
-%package -n glade3-catalog-gtksourceview
-
+%package -n glade-catalog-gtksourceview
 License:        GPLv2+
 Summary:        GTK+ Source Editing Widget -- Catalog for Glade
 Group:          Development/Tools/GUI Builders
 Requires:       libgtksourceview-3_0-0 = %{version}
-Requires:       glade3
-Supplements:    packageand(glade3:%{name}-devel)
+Requires:       glade
+Supplements:    packageand(glade:%{name}-devel)
 
-%description -n glade3-catalog-gtksourceview
+%description -n glade-catalog-gtksourceview
 GtkSourceView is a text widget that extends GtkTextView, the standard
 GTK+ text widget.
 
@@ -79,7 +73,6 @@
 
 This package provides a catalog for Glade, to allow the use the
 GtkSourceView widget in Glade.
-%endif
 
 %package devel
 License:        GPLv2+
@@ -103,9 +96,7 @@
 
 %build
 %configure --disable-static --with-pic\
-%if %{enable_glade_catalog}
-        --enable-glade-catalog\
-%endif
+        --enable-glade-catalog \
         --disable-gtk-doc
 make %{?jobs:-j%jobs} V=1
 
@@ -129,12 +120,9 @@
 %{_libdir}/girepository-1.0/GtkSource-3.0.typelib
 %{_datadir}/gtksourceview-3.0/
 
-%if %{enable_glade_catalog}
-
-%files -n glade3-catalog-gtksourceview
+%files -n glade-catalog-gtksourceview
 %defattr(-, root, root)
-%{_datadir}/glade3/catalogs/gtksourceview-glade.xml
-%endif
+%{_datadir}/glade/catalogs/gtksourceview.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]

Reply via email to