diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index c68d197..be1b5c3 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -7,6 +7,9 @@ %bcond_without hal %endif +# trim changelog included in binary rpms +%global _changelog_trimtime %(date +%s -d "1 year ago") + Summary: The GNOME virtual file-system libraries Name: gnome-vfs2 Version: 2.24.4 @@ -18,9 +21,6 @@ Group: System Environment/Libraries #VCS: git:git://git.gnome.org/gnome-vfs Source0: http://download.gnome.org/sources/gnome-vfs/2.24/gnome-vfs-%{version}.tar.bz2 URL: http://www.gnome.org/ -Requires(post): GConf2 -Requires(pre): GConf2 -Requires(preun): GConf2 BuildRequires: GConf2-devel BuildRequires: libxml2-devel, zlib-devel BuildRequires: glib2-devel @@ -45,6 +45,8 @@ BuildRequires: gettext BuildRequires: libacl-devel BuildRequires: libselinux-devel BuildRequires: keyutils-libs-devel + +Requires: %{name}-common = %{version}-%{release} # For gvfs-open Requires: gvfs @@ -98,10 +100,20 @@ http, ftp, and others. It provides a URI-based API, backend supporting asynchronous file operations, a MIME type manipulation library, and other features. +%package common +Summary: Common files for %{name} +Requires: %{name} = %{version}-%{release} +Requires(post): GConf2 +Requires(pre): GConf2 +Requires(preun): GConf2 +BuildArch: noarch +%description common +%{summary}. + %package devel Summary: Libraries and include files for developing GNOME VFS applications Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the necessary development libraries for writing @@ -110,8 +122,7 @@ GNOME VFS modules and applications that use the GNOME VFS APIs. %package smb Summary: Windows fileshare support for gnome-vfs Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libsmbclient +Requires: %{name}%{?_isa} = %{version}-%{release} %description smb This package provides support for reading and writing files on windows @@ -152,8 +163,10 @@ if pkg-config openssl ; then LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS fi -CFLAGS="%optflags -fno-strict-aliasing" %configure \ - --with-samba-includes=/usr/include/samba-4.0 \ +CFLAGS="%optflags -fno-strict-aliasing" \ +%configure \ + --with-samba-includes=`pkg-config --variable=includedir smbclient` \ + --enable-samba \ --disable-gtk-doc \ %if %{with hal} --enable-hal \ @@ -184,46 +197,62 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %find_lang %{po_package} -%post -/sbin/ldconfig +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root, -) +%doc AUTHORS COPYING COPYING.LIB NEWS README +%{_bindir}/gnomevfs-* +%{_libexecdir}/gnome-vfs-daemon +%{_datadir}/dbus-1/services/gnome-vfs-daemon.service +%{_libdir}/libgnomevfs-2.so.0* +%dir %{_libdir}/gnome-vfs-2.0 +%dir %{_libdir}/gnome-vfs-2.0/modules +%{_libdir}/gnome-vfs-2.0/modules/libbzip2.so +%{_libdir}/gnome-vfs-2.0/modules/libcomputer.so +%{_libdir}/gnome-vfs-2.0/modules/libdns-sd.so +%{_libdir}/gnome-vfs-2.0/modules/libfile.so +%{_libdir}/gnome-vfs-2.0/modules/libftp.so +%{_libdir}/gnome-vfs-2.0/modules/libgzip.so +%{_libdir}/gnome-vfs-2.0/modules/libhttp.so +%{_libdir}/gnome-vfs-2.0/modules/libnetwork.so +%{_libdir}/gnome-vfs-2.0/modules/libnntp.so +%{_libdir}/gnome-vfs-2.0/modules/libsftp.so +%{_libdir}/gnome-vfs-2.0/modules/libtar.so +%{_libdir}/gnome-vfs-2.0/modules/libvfs-test.so + +%post common %gconf_schema_upgrade system_http_proxy system_dns_sd system_smb desktop_gnome_url_handlers desktop_default_applications -%pre +%pre common %gconf_schema_prepare system_http_proxy system_dns_sd system_smb desktop_gnome_url_handlers desktop_default_applications -%preun +%preun common %gconf_schema_remove system_http_proxy system_dns_sd system_smb desktop_gnome_url_handlers desktop_default_applications -%postun -p /sbin/ldconfig - -%files -f %{po_package}.lang -%defattr(-, root, root, -) -%doc AUTHORS COPYING COPYING.LIB NEWS README +%files common -f %{po_package}.lang %dir %{_sysconfdir}/gnome-vfs-2.0 %dir %{_sysconfdir}/gnome-vfs-2.0/modules -%config %{_sysconfdir}/gnome-vfs-2.0/modules/*.conf -%exclude %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf -%{_bindir}/* -%{_libexecdir}/* -%{_libdir}/*.so.* -%exclude %{_libdir}/gnome-vfs-2.0/modules/libsmb.so -%{_libdir}/gnome-vfs-2.0/modules -%dir %{_libdir}/gnome-vfs-2.0 -%{_sysconfdir}/gconf/schemas/* -%{_datadir}/dbus-1/services/gnome-vfs-daemon.service +%config %{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf +%config %{_sysconfdir}/gnome-vfs-2.0/modules/ssl-modules.conf +%{_sysconfdir}/gconf/schemas/*.schemas %files devel %defattr(-, root, root,-) -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/* -%{_libdir}/gnome-vfs-2.0/include -%{_includedir}/* -%{_datadir}/gtk-doc/html/gnome-vfs-2.0 +%{_libdir}/libgnomevfs-2.so +%{_libdir}/pkgconfig/gnome-vfs-2.0.pc +%{_libdir}/pkgconfig/gnome-vfs-module-2.0.pc +%{_libdir}/gnome-vfs-2.0/include/ +%{_includedir}/gnome-vfs-2.0/ +%{_includedir}/gnome-vfs-module-2.0/ +%{_datadir}/gtk-doc/html/gnome-vfs-2.0/ %files smb %defattr(-, root, root,-) @@ -231,6 +260,13 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Dec 03 2014 Rex Dieter - 2.24.4-18 +- -common subpkg (#1109477), should ensure koji catches content conflicts +- tighten subpkg deps via %%?_isa +- %%files: list most files explicitly, less globs +- use `pkg-config --variable=includedir smbclient` output instead of hard-coding path +- trim %%changelog + * Wed Dec 03 2014 Rex Dieter 2.24.4-17 - rebuild (#1109477)