Author: freetz Date: Sat Apr 1 20:39:39 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: SPECS: gnome-vfs2.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.165 SPECS/gnome-vfs2.spec:1.166 --- SPECS/gnome-vfs2.spec:1.165 Fri Jan 27 23:15:25 2006 +++ SPECS/gnome-vfs2.spec Sat Apr 1 22:39:33 2006 @@ -1,13 +1,13 @@ # $Revision$, $Date$ -Summary: GNOME2 - virtual file system -Summary(pl): GNOME2 - wirtualny system plików +Summary: GNOME - virtual file system +Summary(pl): GNOME - wirtualny system plików Name: gnome-vfs2 -Version: 2.12.2 -Release: 2 +Version: 2.14.0 +Release: 1 License: LGPL v2+ Group: Applications -Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.12/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: 4d7b9c14af29a9bf813ab4831eeeacbb +Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.14/gnome-vfs-%{version}.tar.bz2 +# Source0-md5: f45ff7d95f7adf49d5abe13f744f5545 Source1: %{name}-defaults.list Patch0: %{name}-no_g_mime.patch Patch1: %{name}-fstab_edit_crash.patch @@ -18,21 +18,21 @@ BuildRequires: ORBit2-devel >= 1:2.12.3 BuildRequires: autoconf BuildRequires: automake +BuildRequires: avahi-glib-devel >= 0.6 BuildRequires: bzip2-devel BuildRequires: dbus-glib-devel >= 0.34 BuildRequires: docbook-dtd412-xml >= 1.0-10 BuildRequires: fam-devel BuildRequires: flex BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.6.2 +BuildRequires: glib2-devel >= 1:2.9.3 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gnome-doc-tools BuildRequires: gtk+2-devel >= 2:2.6.3 BuildRequires: gtk-doc >= 1.4 -BuildRequires: hal-devel >= 0.5.4 +BuildRequires: hal-devel >= 0.5.7 BuildRequires: heimdal-devel >= 0.7 -BuildRequires: howl-devel >= 0.9.10 -BuildRequires: intltool >= 0.30 +BuildRequires: intltool >= 0.34.2 BuildRequires: libbonobo-devel >= 2.10.1 BuildRequires: libsmbclient-devel >= 3.0 BuildRequires: libtool >= 2:1.5.14 @@ -44,52 +44,75 @@ BuildRequires: rpm-build >= 4.1-10 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: zlib-devel -Requires(post): /sbin/ldconfig Requires(post,preun): GConf2 -Requires: hal-libs >= 0.5.4 -Requires: howl-libs >= 0.9.10 -Requires: libbonobo >= 2.10.1 Requires: shared-mime-info >= 0.15 Obsoletes: gnome-vfs-extras Obsoletes: gnome-vfs2-vfolder-menu Conflicts: gnome-vfs2-module-menu <= 0.8-1 Conflicts: libgnome < 2.5.1 +Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -GNOME2 Virtual File System library. +GNOME Virtual File System. %description -l pl -Biblioteka Wirtualnego Systemu Plików GNOME2. +Wirtualny Systemu Plików GNOME. + +%package libs +Summary: gnome-vfs library +Summary(pl): Biblioteka gnome-vfs +Group: Development/Libraries +Requires: hal-libs >= 0.5.6 +Requires: libbonobo >= 2.10.1 + +%description libs +This package contains gnome-vfs libraries. + +%description libs -l pl +Pakiet zawiera biblioteki gnome-vfs. %package devel -Summary: gnome-vfs2 - header files -Summary(pl): gnome-vfs2 - pliki nagłówkowe +Summary: gnome-vfs - header files +Summary(pl): gnome-vfs - pliki nagłówkowe Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: GConf2-devel >= 2.12.0 +Requires: avahi-glib-devel >= 0.6 +Requires: dbus-glib-devel >= 0.34 Requires: gtk-doc-common -Requires: howl-devel >= 0.9.10 Requires: libbonobo-devel >= 2.10.1 Requires: openssl-devel >= 0.9.7d %description devel -This package contains header files for gnome-vfs2 library. +This package contains header files for gnome-vfs library. %description devel -l pl -Pakiet ten zawiera pliki nagłówkowe biblioteki gnome-vfs2. +Pakiet ten zawiera pliki nagłówkowe biblioteki gnome-vfs. %package static -Summary: gnome-vfs2 - static libraries -Summary(pl): gnome-vfs2 - biblioteki statyczne +Summary: gnome-vfs - static libraries +Summary(pl): gnome-vfs - biblioteki statyczne Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static -This package contains static gnome-vfs2 libraries. +This package contains static gnome-vfs libraries. %description static -l pl -Pakiet ten zawiera biblioteki statyczne gnome-vfs2. +Pakiet ten zawiera biblioteki statyczne gnome-vfs. + +%package apidocs +Summary: gnome-vfs API documetation +Summary(pl): Dokumentacja API gnome-vfs +Group: Documentation +Requires: gtk-doc-common + +%description apidocs +gnome-vfs API documetation. + +%description apidocs -l pl +Dokumentacja API gnome-vfs. %prep %setup -q -n gnome-vfs-%{version} @@ -106,10 +129,12 @@ %{__autoconf} %{__automake} %configure \ - --enable-gtk-doc \ - --with-html-dir=%{_gtkdocdir} \ + --disable-howl \ --disable-schemas-install \ - --enable-ipv6 + --enable-gtk-doc \ + --enable-ipv6 \ + --with-html-dir=%{_gtkdocdir} + %{__make} %install @@ -135,13 +160,11 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig %gconf_schema_install desktop_default_applications.schemas %gconf_schema_install desktop_gnome_url_handlers.schemas %gconf_schema_install system_dns_sd.schemas %gconf_schema_install system_http_proxy.schemas %gconf_schema_install system_smb.schemas -%gconf_schema_install system_storage.schemas %preun %gconf_schema_uninstall desktop_default_applications.schemas @@ -149,9 +172,9 @@ %gconf_schema_uninstall system_dns_sd.schemas %gconf_schema_uninstall system_http_proxy.schemas %gconf_schema_uninstall system_smb.schemas -%gconf_schema_uninstall system_storage.schemas -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files -f gnome-vfs-2.0.lang %defattr(644,root,root,755) @@ -162,10 +185,8 @@ %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas %{_sysconfdir}/gconf/schemas/system_http_proxy.schemas %{_sysconfdir}/gconf/schemas/system_smb.schemas -%{_sysconfdir}/gconf/schemas/system_storage.schemas %attr(755,root,root) %{_bindir}/gnomevfs-* %attr(755,root,root) %{_libdir}/gnome-vfs-daemon -%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/*.so @@ -173,6 +194,10 @@ %attr(755,root,root) %{_libdir}/bonobo/monikers/*.so %{_desktopdir}/*.list +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/*.so.*.* + %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/*.so @@ -181,18 +206,82 @@ %{_includedir}/gnome-vfs-module-2.0 %{_libdir}/gnome-vfs-2.0/include %{_pkgconfigdir}/*.pc -%{_gtkdocdir}/gnome-vfs-2.0 %files static %defattr(644,root,root,755) %{_libdir}/lib*.a +%files apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/gnome-vfs-2.0 + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.166 2006/04/01 20:39:33 freetz +- merged from DEVEL + +Revision 1.164.2.19 2006/03/13 13:45:29 freetz +- updated hal-devel BR + +Revision 1.164.2.18 2006/03/13 13:44:26 freetz +- 2.14.0, runtime gnome-mount detection, depend on new hal API + +Revision 1.164.2.17 2006/03/11 20:00:01 freetz +- sorted R: + +Revision 1.164.2.16 2006/03/11 19:46:29 freetz +- fixed -devel Requires (thx pluto), rel.2 + +Revision 1.164.2.15 2006/02/27 15:04:50 freetz +- 2.13.92, expect some experiments (pmount/hal-mount/gnome-mount) here + +Revision 1.164.2.14 2006/02/24 13:49:50 freetz +- re-enable gnome-mount support for test with gnome-mount-0.4, r.5.1 + +Revision 1.164.2.13 2006/02/23 17:35:21 freetz +- dropped storage-methods + +Revision 1.164.2.12 2006/02/19 21:45:11 freetz +- disable gnome-mount (too much PITA for now, waiting for something usable) + rel.4 + +Revision 1.164.2.11 2006/02/19 21:15:51 qboosh +- libs/devel files fix + +Revision 1.164.2.10 2006/02/19 20:42:01 freetz +- libs subpackage added, rel.3 + +Revision 1.164.2.9 2006/02/18 22:24:15 freetz +- require storage-methods, rel.2 + +Revision 1.164.2.8 2006/02/17 05:36:16 aflinta +- latest inteltool required + +Revision 1.164.2.7 2006/02/13 11:50:00 freetz +- 2.13.91 + +Revision 1.164.2.6 2006/01/23 08:48:51 freetz +- updated BR, TODO done + +Revision 1.164.2.5 2006/01/21 23:27:33 freetz +- corrected avahi build requirement + +Revision 1.164.2.4 2006/01/21 23:22:44 freetz +- BR: avahi-devel, enable gnome-mount + +Revision 1.164.2.3 2006/01/18 21:44:01 freetz +- more howl disabling + +Revision 1.164.2.2 2006/01/18 21:41:36 freetz +- 2.13.4, disable howl for now, TODO added, apidocs subpkg, updated BR + +Revision 1.164.2.1 2006/01/05 13:39:07 patrys +- up to 2.13.3 + Revision 1.165 2006/01/27 22:15:25 pluto - release 2 for rebuild with new dbus. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.165&r2=1.166&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
