- fixed build with gnome 3 (disabled panel and gtkhtml support)

- release 6

Changed files:
    dotnet-gnome-desktop-sharp.spec -> 1.12

diff --git a/dotnet-gnome-desktop-sharp.spec b/dotnet-gnome-desktop-sharp.spec
index 4dcbd6c0ade64d0ef5a8b72c98d12cfe4f9b4790..005336b56c22d80d39b5a6936c51163c3334bfb8 100644 (file)
--- a/dotnet-gnome-desktop-sharp.spec
+++ b/dotnet-gnome-desktop-sharp.spec
@@ -7,7 +7,7 @@ Summary:        .NET language bindings for some of the GNOME desktop libraries
 Summary(pl.UTF-8):     Wiązania niektórych bibliotek GNOME desktop dla .NET
 Name:          dotnet-gnome-desktop-sharp
 Version:       2.26.0
-Release:       5
+Release:       6
 License:       LGPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop-sharp/2.26/gnome-desktop-sharp-%{version}.tar.bz2
@@ -18,23 +18,21 @@ BuildRequires:      autoconf
 BuildRequires: automake
 BuildRequires: dotnet-gnome-sharp-devel >= 2.24.1
 BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.2
-BuildRequires: gnome-desktop-devel >= %{gnome_version}
-BuildRequires: gnome-panel-devel >= %{gnome_version}
+BuildRequires: gnome-desktop2-devel >= %{gnome_version}
 BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: gtkhtml-devel >= 3.24.0
 BuildRequires: gtksourceview2-devel >= 2.2.2
 BuildRequires: libgnomeprintui-devel >= 2.18.0
 BuildRequires: librsvg-devel >= 2.22.2
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= %{gnome_version}
+BuildRequires: libwnck2-devel >= %{gnome_version}
 BuildRequires: mono-csharp >= 1.1.16.1
 BuildRequires: monodoc >= 1.1.16
 BuildRequires: pkgconfig
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(monoautodeps)
-BuildRequires: vte-devel >= 0.16.14
+BuildRequires: vte0-devel >= 0.16.14
 BuildConflicts:        nautilus-cd-burner-devel
-Requires:      gnome-desktop-libs >= 2.30
+Requires:      gnome-desktop2 >= 2.30
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -101,20 +99,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnomepanelsharpglue-2.so
-%attr(755,root,root) %{_libdir}/libgtkhtmlsharpglue-2.so
 %attr(755,root,root) %{_libdir}/libgtksourceview2sharpglue-2.so
 %attr(755,root,root) %{_libdir}/libwncksharpglue-2.so
 %attr(755,root,root) %{_libdir}/libvtesharpglue-2.so
-%{_libdir}/libgnomepanelsharpglue-2.la
-%{_libdir}/libgtkhtmlsharpglue-2.la
 %{_libdir}/libgtksourceview2sharpglue-2.la
 %{_libdir}/libwncksharpglue-2.la
 %{_libdir}/libvtesharpglue-2.la
-%{_prefix}/lib/mono/gac/gnome-panel-sharp
 %{_prefix}/lib/mono/gac/gnome-print-sharp
 %{_prefix}/lib/mono/gac/gnomedesktop-sharp
-%{_prefix}/lib/mono/gac/gtkhtml-sharp
 %{_prefix}/lib/mono/gac/gtksourceview2-sharp
 %{_prefix}/lib/mono/gac/rsvg2-sharp
 %{_prefix}/lib/mono/gac/vte-sharp
@@ -122,26 +114,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_prefix}/lib/mono/gnome-panel-sharp-2.24
 %{_prefix}/lib/mono/gnome-print-sharp-2.18
 %{_prefix}/lib/mono/gnomedesktop-sharp-2.20
-%{_prefix}/lib/mono/gtkhtml-sharp-3.14
 %{_prefix}/lib/mono/gtksourceview2-sharp-2.0
 %{_prefix}/lib/mono/rsvg2-sharp-2.0
 %{_prefix}/lib/mono/vte-sharp-0.16
 %{_prefix}/lib/mono/wnck-sharp-2.20
-%{_datadir}/gnome-panel-sharp
 %{_datadir}/gnome-print-sharp
 %{_datadir}/gnomedesktop-sharp
-%{_datadir}/gtkhtml-sharp
 %{_datadir}/gtksourceview2-sharp
 %{_datadir}/rsvg2-sharp
 %{_datadir}/vte-sharp
 %{_datadir}/wnck-sharp
 %{_pkgconfigdir}/gnome-desktop-sharp-2.0.pc
-%{_pkgconfigdir}/gnome-panel-sharp-2.24.pc
 %{_pkgconfigdir}/gnome-print-sharp-2.18.pc
-%{_pkgconfigdir}/gtkhtml-sharp-3.14.pc
 %{_pkgconfigdir}/gtksourceview2-sharp.pc
 %{_pkgconfigdir}/rsvg2-sharp-2.0.pc
 %{_pkgconfigdir}/vte-sharp-0.16.pc
@@ -149,8 +135,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgnomepanelsharpglue-2.a
-%{_libdir}/libgtkhtmlsharpglue-2.a
 %{_libdir}/libgtksourceview2sharpglue-2.a
 %{_libdir}/libwncksharpglue-2.a
 %{_libdir}/libvtesharpglue-2.a