- revised deps

- fixed %files

Changed files:
    libpeas.spec -> 1.7

diff --git a/libpeas.spec b/libpeas.spec
index 2cdebcb36b1d73d0f1531cfa210b5dd557645aa1..44ab6f556c8ef59f006eabd32cba41a2d49fab4f 100644 (file)
--- a/libpeas.spec
+++ b/libpeas.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
 %bcond_without static_libs     # don't build static libraries
@@ -14,28 +15,29 @@ Source0:    http://ftp.gnome.org/pub/GNOME/sources/libpeas/0.7/%{name}-%{version}.t
 Patch0:                gir.patch
 URL:           http://live.gnome.org/Libpeas
 BuildRequires: autoconf >= 2.63.2
-BuildRequires: automake >= 1.11
-BuildRequires: libtool >= 2.2.6
-BuildRequires: intltool >= 0.40.0
+BuildRequires: automake >= 1:1.11
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: glib2-devel >= 1:2.24.0
-BuildRequires: gobject-introspection-devel >= 0.9.6
+BuildRequires: gnome-common
+BuildRequires: gobject-introspection-devel >= 0.10.1
 BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: seed-devel >= 2.31.91
+BuildRequires: gtk-doc >= 1.11
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: python >= 2.5.2
 BuildRequires: python-pygobject-devel >= 2.20.0
-BuildRequires: gtk-doc >= 1.11
-BuildRequires: gnome-common
+BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: seed-devel >= 2.31.91
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-libpeas is a gobject-based plugins engine, and is targetted at giving 
-every application the chance to assume its own extensibility. It also 
+libpeas is a gobject-based plugins engine, and is targetted at giving
+every application the chance to assume its own extensibility. It also
 has a set of features including, but not limited to:
 
  - multiple extension points
  - on demand (lazy) programming language support for C, Python and JS
- - simplicity of the API 
+ - simplicity of the API
 
 %package loader-python
 Summary:       Python loader for libpeas library
@@ -58,6 +60,8 @@ Summary:      Header files for libpeas library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libpeas
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= 1:2.24.0
+Requires:      gobject-introspection-devel >= 0.10.1
 
 %description devel
 Header files for libpeas library.
@@ -80,24 +84,27 @@ Statyczna biblioteka libpeas.
 %package gtk
 Summary:       GObject Plugin System
 Summary(pl.UTF-8):     System wtyczek GObject
-Group:         Libraries
+Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gtk
-libpeas is a gobject-based plugins engine, and is targetted at giving 
-every application the chance to assume its own extensibility. It also 
+libpeas is a gobject-based plugins engine, and is targetted at giving
+every application the chance to assume its own extensibility. It also
 has a set of features including, but not limited to:
 
  - multiple extension points
  - on demand (lazy) programming language support for C, Python and JS
- - simplicity of the API 
+ - simplicity of the API
 
 %package gtk-devel
 Summary:       Header files for libpeas-gtk library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libpeas-gtk
-Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
 Requires:      %{name}-gtk = %{version}-%{release}
+Requires:      gtk+3-devel >= 3.0.0
 
 %description gtk-devel
 Header files for libpeas-gtk library.
@@ -108,7 +115,7 @@ Pliki nagłówkowe biblioteki libpeas-gtk.
 %package gtk-static
 Summary:       Static libpeas-gtk library
 Summary(pl.UTF-8):     Statyczna biblioteka libpeas-gtk
-Group:         Development/Libraries
+Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      %{name}-gtk-devel = %{version}-%{release}
 
@@ -122,6 +129,7 @@ Statyczna biblioteka libpeas.
 Summary:       libpeas API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libpeas
 Group:         Documentation
+Requires:      gtk-doc-common
 
 %description apidocs
 API and internal documentation for libpeas library.
@@ -131,8 +139,8 @@ Dokumentacja API biblioteki libpeas.
 
 %package demo
 Summary:       Demo application for libpeas
-Summary(pl.UTF-8): Aplikacja demonstracyjna libpeas
-Group:         Application
+Summary(pl.UTF-8):     Aplikacja demonstracyjna libpeas
+Group:         Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-gtk = %{version}-%{release}
 Requires:      %{name}-loader-python = %{version}-%{release}
@@ -155,9 +163,10 @@ Aplikacja demonstracyjna libpeas.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        %{__enable_disable static_libs static} \
        %{__enable_disable apidocs gtk-doc} \
-       --disable-silent-rules
+       --with-html-dir=%{_gtkdocdir}
 %{__make}
 
 %install
@@ -182,8 +191,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
-%post  gtk -p /sbin/ldconfig
-%postun        gtk -p /sbin/ldconfig
+
+%post gtk
+/sbin/ldconfig
+%update_icon_cache hicolor
+
+%postun        gtk
+/sbin/ldconfig
+%update_icon_cache hicolor
 
 %files -f libpeas.lang
 %defattr(644,root,root,755)
@@ -192,20 +207,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libpeas-1.0.so.0
 %dir %{_libdir}/libpeas-1.0
 %dir %{_libdir}/libpeas-1.0/loaders
-%{_libdir}/libpeas-1.0/loaders/libcloader.so
+%attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libcloader.so
 %{_libdir}/girepository-1.0/Peas-1.0.typelib
 
 %files loader-python
 %defattr(644,root,root,755)
-%{_libdir}/libpeas-1.0/loaders/libpythonloader.so
+%attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libpythonloader.so
 
 %files loader-seed
 %defattr(644,root,root,755)
-%{_libdir}/libpeas-1.0/loaders/libseedloader.so
+%attr(755,root,root) %{_libdir}/libpeas-1.0/loaders/libseedloader.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libpeas-1.0.so
+%attr(755,root,root) %{_libdir}/libpeas-1.0.so
 %{_includedir}/libpeas-1.0
 %{_pkgconfigdir}/libpeas-1.0.pc
 %{_datadir}/gir-1.0/Peas-1.0.gir
@@ -226,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk-devel
 %defattr(644,root,root,755)
-%{_libdir}/libpeas-gtk-1.0.so
+%attr(755,root,root) %{_libdir}/libpeas-gtk-1.0.so
 %{_pkgconfigdir}/libpeas-gtk-1.0.pc
 %{_datadir}/gir-1.0/PeasGtk-1.0.gir
 
@@ -253,5 +268,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_datadir}/gtk-doc/html/libpeas
+%{_gtkdocdir}/libpeas
 %endif