- unconditional noarch subpackages

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

diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index f5712377a02a52faa3fe68eda88614d2ed5e70d9..f6b88c57dc121acdc08e8d569ce6fa3e6ccf368c 100644 (file)
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -2,12 +2,12 @@
 # Conditional build:
 %bcond_with    hal             # build with HAL support (HAL is deprecated)
 %bcond_without static_libs     # static library
-#
+
 Summary:       GNOME - virtual file system
 Summary(pl.UTF-8):     GNOME - wirtualny system plików
 Name:          gnome-vfs2
 Version:       2.24.4
-Release:       13
+Release:       17
 License:       LGPL v2+
 Group:         Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Patch3:               %{name}-headers-define.patch
 Patch4:                %{name}-ac-libs.patch
 Patch5:                %{name}-glib.patch
 Patch6:                am.patch
+Patch7:                openssl.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: acl-devel >= 2.2.34
@@ -32,7 +33,7 @@ BuildRequires:        dbus-glib-devel >= 0.73
 BuildRequires: docbook-dtd412-xml >= 1.0-10
 BuildRequires: fam-devel
 BuildRequires: flex
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.18.0
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gtk-doc >= 1.8
@@ -118,6 +119,7 @@ Summary:    gnome-vfs API documentation
 Summary(pl.UTF-8):     Dokumentacja API gnome-vfs
 Group:         Documentation
 Requires:      gtk-doc-common
+BuildArch:     noarch
 
 %description apidocs
 gnome-vfs API documentation.
@@ -134,6 +136,10 @@ Dokumentacja API gnome-vfs.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+
+# fix for make -C doc
+iconv -f iso8859-2 -t utf8 libgnomevfs/gnome-vfs-job-queue.h > libgnomevfs/gnome-vfs-job-queue.h.new && mv libgnomevfs/gnome-vfs-job-queue.h.new libgnomevfs/gnome-vfs-job-queue.h
 
 %build
 %{__gtkdocize}
@@ -147,6 +153,8 @@ Dokumentacja API gnome-vfs.
        %{__enable_disable hal hal} \
        --disable-howl \
        --disable-schemas-install \
+       --with-samba-includes=`pkg-config --variable=includedir smbclient` \
+       --enable-samba \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
        --enable-ipv6 \
@@ -168,9 +176,9 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.a
 %endif
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/defaults.list
 
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr@ije,sr@ijekavian}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr@ije,sr@ijekavian}
 
 %find_lang gnome-vfs-2.0
 
@@ -217,7 +225,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnomevfs-mv
 %attr(755,root,root) %{_bindir}/gnomevfs-rm
 %attr(755,root,root) %{_libexecdir}/gnome-vfs-daemon
-%dir %{_libdir}/gnome-vfs-2.0/modules
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libbzip2.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libcomputer.so
 %attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/libdns-sd.so
@@ -239,6 +246,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgnomevfs-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgnomevfs-2.so.0
 %dir %{_libdir}/gnome-vfs-2.0
+%dir %{_libdir}/gnome-vfs-2.0/modules
 
 %files devel
 %defattr(644,root,root,755)