- simplified {,Build}Requires

[packages/gnome-vfs2.git] / gnome-vfs2.spec

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 80581270db0b6c4346fbd1ea85bbab292de0f6aa..1176e220258dab61284f50c75e8079f5faaa8ead 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,36 +1,37 @@
 Summary:       GNOME2 - virtual file system
 Summary(pl):   GNOME2 - wirtualny system plików
 Name:          gnome-vfs2
-Version:       2.0.0
+Version:       2.0.4.1
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-vfs/gnome-vfs-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.0/gnome-vfs-%{version}.tar.bz2
 Patch0:                %{name}-am15.patch
 Patch1:                %{name}-rm_GNOME_COMMON_INIT_and_GNOME_PLATFORM_GNOME_2.patch
 Patch2:                %{name}-applnk.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 1.2.0
-BuildRequires: ORBit2-devel >= 2.4.0
+BuildRequires: GConf2-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 1.0.0
 BuildRequires: bzip2-devel
+BuildRequires: cdparanoia-III-devel
+# install stage fails with docbook-dtd412-xml-1.0-8
+BuildRequires:  docbook-dtd412-xml >= 1.0-10 
 BuildRequires: fam-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 2.0.3
-BuildRequires: gnome-mime-data-devel >= 2.0.0
-BuildRequires: libbonobo-devel >= 2.0.0
+BuildRequires: gnome-common
+BuildRequires: gnome-mime-data-devel
+BuildRequires: gtk-doc >= 0.9-6
+BuildRequires: libbonobo-devel
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.4.22
-BuildRequires: openssl-devel >= 0.9.6d
+BuildRequires: openssl-devel
 BuildRequires: zlib-devel
-BuildRequires: gnome-common
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11/GNOME2
+%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
 
 %description
 GNOME2 Virtual File System library.
@@ -43,6 +44,15 @@ Summary:     gnome-vfs2 - header files
 Summary(pl):   gnome-vfs2 - pliki nag³ówkowe
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      GConf2-devel
+Requires:      bzip2-devel
+Requires:      cdparanoia-III-devel
+Requires:      fam-devel
+Requires:      gnome-mime-data-devel
+Requires:      gtk-doc-common
+Requires:      libbonobo-devel
+Requires:      openssl-devel
+Requires:      zlib-devel
 
 %description devel
 This package contains header files for gnome-vfs2 library.
@@ -71,15 +81,14 @@ Pakiet ten zawiera biblioteki statyczne gnome-vfs2.
 %build
 rm -f missing
 %{__libtoolize}
-aclocal -I %{_aclocaldir}/gnome2-macros
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-gtk-doc
+       --enable-gtk-doc \
+       --with-html-dir=%{_gtkdocdir}
 %{__make}
 
-gzip -9nf AUTHORS ChangeLog NEWS README
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -94,28 +103,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %post   
 /sbin/ldconfig
-GCONF_CONFIG_SOURCE="" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+GCONF_CONFIG_SOURCE="`/usr/X11R6/bin/gconftool-2 --get-default-source`" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
 
 %postun -p /sbin/ldconfig
 
 %files -f gnome-vfs-2.0.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS ChangeLog NEWS README
 %{_sysconfdir}/gnome-vfs-2.0
 %{_sysconfdir}/gconf/schemas/*
 %attr(755,root,root) %{_libdir}/*.so.*.*
 %dir %{_libdir}/gnome-vfs-2.0
 %dir %{_libdir}/gnome-vfs-2.0/modules
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.??
+%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.so
+%{_libdir}/gnome-vfs-2.0/modules/*.la
 %attr(755,root,root) %{_libdir}/vfs
 %{_libdir}/bonobo/servers/*
-%{_libdir}/bonobo/monikers/*.??
+%attr(755,root,root) %{_libdir}/bonobo/monikers/*.so
+%{_libdir}/bonobo/monikers/*.la
 
 %files devel
 %defattr(644,root,root,755)
-%doc %{_datadir}/gtk-doc/html/gnome-vfs-2.0
+%doc %{_gtkdocdir}/gnome-vfs-2.0
 %attr(755,root,root) %{_libdir}/*.so
-%attr(755,root,root) %{_libdir}/*.la
+%{_libdir}/*.la
 %{_includedir}/gnome-vfs-2.0
 %{_includedir}/gnome-vfs-module-2.0
 %{_libdir}/gnome-vfs-2.0/include
@@ -125,3 +136,4 @@ GCONF_CONFIG_SOURCE="" /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sys
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 %{_libdir}/gnome-vfs-2.0/modules/*.a
+%{_libdir}/bonobo/monikers/*.a