- added -apidocs and vala-avant-window-navigator subpackages

- revised deps

Changed files:
    avant-window-navigator.spec -> 1.26

diff --git a/avant-window-navigator.spec b/avant-window-navigator.spec
index 41e00d45cb77f00295d39389738c4bed35befe41..3be13afd311bff847c4ed107046f79c1dd309f35 100644 (file)
--- a/avant-window-navigator.spec
+++ b/avant-window-navigator.spec
@@ -1,5 +1,3 @@
-#
-# To do: package vala and apidocs
 Summary:       Fully customisable dock-like window navigator for GNOME
 Summary(pl.UTF-8):     W pełni konfigurowalny dokowy nawigator okien dla GNOME
 Name:          avant-window-navigator
@@ -15,30 +13,32 @@ BuildRequires:      autoconf
 BuildRequires: automake >= 1:1.8
 BuildRequires: dbus-glib-devel >= 0.30
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.0
 BuildRequires: gnome-desktop-devel >= 2.0
-BuildRequires: gnome-doc-utils >= 0.7.1
 BuildRequires: gnome-vfs2-devel >= 2.0
 BuildRequires: gtk+2-devel >= 2:2.10.0
+BuildRequires: gtk-doc >= 1.4
 BuildRequires: intltool >= 0.34
-BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnome-devel
 BuildRequires: libtool
 BuildRequires: libwnck-devel >= 2.20.0
 BuildRequires: pkgconfig
 BuildRequires: python-devel >= 2.3.5
-BuildRequires: python-gnome-devel
 BuildRequires: python-pycairo-devel >= 1.0.2
-BuildRequires: python-pygtk-devel >= 2:2.8.0
-BuildRequires: python-pyxdg
+BuildRequires: python-pygtk-devel >= 2:2.10.0
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: vala >= 0.5.4
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXrender-devel
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): gtk+2 >= 2:2.10.0
 Requires(post,postun): hicolor-icon-theme
+Requires(post,preun):  GConf2
 Requires:      python-pycairo >= 1.0.2
-Requires:      python-pygtk-gtk >= 2:2.8.0
+Requires:      python-pygtk-glade >= 2:2.10.0
+Requires:      python-pygtk-gtk >= 2:2.10.0
 Requires:      python-pyxdg
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,18 +54,14 @@ dole ekranu śledzący otwarte okna.
 %package devel
 Summary:       Headers for avant window navigator library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki nawigatora okien avant
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      GConf2-devel >= 2.14.0
 Requires:      dbus-glib-devel >= 0.30
+Requires:      glib2-devel >= 1:2.16.0
 Requires:      gnome-desktop-devel >= 2.0
 Requires:      gnome-vfs2-devel >= 2.0
 Requires:      gtk+2-devel >= 2:2.10.0
-Requires:      libglade2-devel >= 1:2.6.0
-Requires:      libwnck-devel >= 2.20.0
-Requires:      xorg-lib-libXcomposite-devel
-Requires:      xorg-lib-libXdamage-devel
-Requires:      xorg-lib-libXrender-devel
 
 %description devel
 Headers for avant window navigator library.
@@ -76,7 +72,7 @@ Pliki nagłówkowe biblioteki nawigatora okien avant.
 %package static
 Summary:       Static avant window navigator library
 Summary(pl.UTF-8):     Statyczna biblioteka nawigatora okien avant
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
@@ -85,6 +81,29 @@ Static avant window navigator library.
 %description static -l pl.UTF-8
 Statyczna biblioteka nawigatora okien avant.
 
+%package apidocs
+Summary:       libawn library API documentation
+Summary(pl.UTF-8):     Dokumentacja API biblioteki libawn
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+libawn library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libawn.
+
+%package -n vala-avant-window-navigator
+Summary:       Vala bindings to libawn library
+Summary(pl.UTF-8):     Wiązania Vala do biblioteki libawn
+Group:         Development/Libraries
+
+%description -n vala-avant-window-navigator
+Vala bindings to libawn library.
+
+%description -n vala-avant-window-navigator -l pl.UTF-8
+Wiązania Vala do biblioteki libawn.
+
 %prep
 %setup -q
 
@@ -95,7 +114,11 @@ Statyczna biblioteka nawigatora okien avant.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --enable-gtk-doc \
+       --with-html-dir=%{_gtkdocdir} \
+       --disable-pymod-checks \
+       --disable-schemas-install
 
 %{__make}
 
@@ -111,12 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/awn/awn.{la,a}
 %py_postclean
 
-%find_lang %{name} --with-gnome --all-name
-
-# move docs into proper place
-%{__mv} -f $RPM_BUILD_ROOT%{_datadir}/gtk-doc $RPM_BUILD_ROOT%{_docdir}
-# delete the rest
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/html/
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -127,18 +145,17 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install awn-applets-shared.schemas
 %update_icon_cache hicolor
 
-%postun
-/sbin/ldconfig
-%update_icon_cache hicolor
-
 %preun
 %gconf_schema_uninstall awn.schemas
 %gconf_schema_uninstall awn-applets-shared.schemas
 
+%postun
+/sbin/ldconfig
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO doc/reference/html/*
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_sysconfdir}/gconf/schemas/awn.schemas
 %{_sysconfdir}/gconf/schemas/awn-applets-shared.schemas
 %attr(755,root,root) %{_bindir}/avant-window-navigator
@@ -174,3 +191,12 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libawn.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libawn
+
+%files -n vala-avant-window-navigator
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/awn.deps
+%{_datadir}/vala/vapi/awn.vapi