Author: paladine Date: Mon Mar 7 22:20:07 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: SPECS: gnome-vfs2.spec (1.138 -> 1.139) ---- Diffs: ================================================================ Index: SPECS/gnome-vfs2.spec diff -u SPECS/gnome-vfs2.spec:1.138 SPECS/gnome-vfs2.spec:1.139 --- SPECS/gnome-vfs2.spec:1.138 Wed Feb 23 14:12:21 2005 +++ SPECS/gnome-vfs2.spec Mon Mar 7 23:20:01 2005 @@ -6,44 +6,37 @@ Summary: GNOME2 - virtual file system Summary(pl): GNOME2 - wirtualny system plików Name: gnome-vfs2 -Version: 2.8.4 +Version: 2.10.0 Release: 1 License: LGPL Group: Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.8/gnome-vfs-%{version}.tar.bz2 -# Source0-md5: 42d3505e9ef9c26a7aae4e511b9b4c34 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.10/gnome-vfs-%{version}.tar.bz2 +# Source0-md5: bb9df65d6a77414bbde9f1bc429c9d97 Source1: %{name}-defaults.list -Patch0: %{name}-applnk.patch -Patch1: %{name}-application.patch -Patch2: %{name}-onlyshowin.patch -Patch3: %{name}-capplets-dir.patch -Patch4: %{name}-gnome2-dir.patch -Patch5: %{name}-categories.patch -Patch6: %{name}-hal.patch -Patch7: %{name}-defaults-path.patch +Patch0: %{name}-defaults-path.patch URL: http://www.gnome.org/ -BuildRequires: GConf2-devel >= 2.8.0.1 -BuildRequires: ORBit2-devel >= 1:2.12.0 +BuildRequires: GConf2-devel >= 2.10.0 +BuildRequires: ORBit2-devel >= 1:2.12.1 BuildRequires: autoconf BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: cdparanoia-III-devel -%{?with_hal:BuildRequires: dbus-glib-devel >= 0.22-5} +%{?with_hal:BuildRequires: dbus-glib-devel >= 0.23} BuildRequires: docbook-dtd412-xml >= 1.0-10 BuildRequires: fam-devel BuildRequires: flex BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.4.4 +BuildRequires: glib2-devel >= 1:2.6.2 BuildRequires: gnome-common >= 2.8.0 BuildRequires: gnome-doc-tools BuildRequires: gnome-mime-data-devel >= 2.4.1 -BuildRequires: gtk+2-devel >= 2:2.4.4 +BuildRequires: gtk+2-devel >= 2:2.6.2 BuildRequires: gtk-doc >= 1.1 -%{?with_hal:BuildRequires: hal-devel >= 0.4.0} +%{?with_hal:BuildRequires: hal-devel >= 0.4.7} BuildRequires: heimdal-devel BuildRequires: howl-devel >= 0.9.6-2 BuildRequires: intltool >= 0.30 -BuildRequires: libbonobo-devel >= 2.6.1 +BuildRequires: libbonobo-devel >= 2.8.1 BuildRequires: libsmbclient-devel >= 3.0 BuildRequires: libtool BuildRequires: libxml2-devel >= 2.6.0 @@ -53,13 +46,13 @@ BuildRequires: popt-devel BuildRequires: rpm-build >= 4.1-10 BuildRequires: zlib-devel -Requires: desktop-file-utils >= 0.7 -Requires: gnome-vfs-menu-module >= 1.0-1 -%{?with_hal:Requires: hal-libs >= 0.4.0} +Requires: desktop-file-utils >= 0.9 +%{?with_hal:Requires: hal-libs >= 0.4.7} Requires: howl-libs >= 0.9.6-2 -Requires: libbonobo >= 2.6.1 -Requires: shared-mime-info >= 0.14 +Requires: libbonobo >= 2.8.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 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -75,10 +68,10 @@ Summary(pl): gnome-vfs2 - pliki nagłówkowe Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: GConf2-devel >= 2.8.0.1 +Requires: GConf2-devel >= 2.10.0 Requires: gtk-doc-common Requires: howl-devel >= 0.9.6-2 -Requires: libbonobo-devel >= 2.6.1 +Requires: libbonobo-devel >= 2.8.1 Requires: openssl-devel >= 0.9.7d %description devel @@ -99,30 +92,9 @@ %description static -l pl Pakiet ten zawiera biblioteki statyczne gnome-vfs2. -%package vfolder-menu -Summary: gnome-vfs2 - vfolder based GNOME menu -Summary(pl): gnome-vfs2 - menu GNOME przy użyciu vfolder -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Provides: gnome-vfs-menu-module = 1.0-1 -Obsoletes: gnome-vfs2-module-menu - -%description vfolder-menu -Vfolder based GNOME menu. - -%description vfolder-menu -l pl -Menu GNOME przy użyciu vfolder. - %prep %setup -q -n gnome-vfs-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 -%patch5 -p1 -%patch6 -p0 -%patch7 -p1 %build %{__libtoolize} @@ -139,7 +111,6 @@ %else --disable-hal %endif - %{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\"" %install @@ -150,18 +121,6 @@ m4dir=%{_aclocaldir} \ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -cp $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf \ - default-modules.conf.tmp -# only menu -grep -E '(applications:|all-applications:|applications-all-users:)' \ - default-modules.conf.tmp \ - > $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf -# all but menu -grep -Ev '(applications:|all-applications:|applications-all-users:)' \ - default-modules.conf.tmp \ - > $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf -rm -f default-modules.conf.tmp - # no static modules rm -f $RPM_BUILD_ROOT%{_libdir}/{gnome-vfs-2.0/modules,bonobo/monikers}/*.{la,a} rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/filesystems/*.{la,a} @@ -186,7 +145,6 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README %{_sysconfdir}/gnome-vfs-2.0 -%exclude %{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf %{_sysconfdir}/gconf/schemas/* %attr(755,root,root) %{_bindir}/gnomevfs-* %attr(755,root,root) %{_libdir}/gnome-vfs-daemon @@ -213,20 +171,44 @@ %defattr(644,root,root,755) %{_libdir}/lib*.a -%files vfolder-menu -%defattr(644,root,root,755) -%{_sysconfdir}/gnome-vfs-2.0/modules/menu.conf - %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.139 2005/03/07 22:20:01 paladine +- merged from DEVEL + Revision 1.138 2005/02/23 13:12:21 paladine - updated to 2.8.4 - proper license - missing BR: pkgconfig + +Revision 1.137.2.6 2005/03/07 17:48:00 wiget +- updated to 2.10.0 + +Revision 1.137.2.5 2005/03/03 09:15:28 paladine +- updated to 2.9.93 + +Revision 1.137.2.4 2005/03/01 11:50:56 paladine +- updated to 2.9.92 +- proper license + +Revision 1.137.2.3 2005/02/13 18:51:33 grzegol +- R: gnome-vfs-menu-module isn't needed +- rel. 1 + +Revision 1.137.2.2 2005/02/10 18:36:05 grzegol +- updated to 2.9.91 + +Revision 1.137.2.1 2005/02/06 22:16:35 grzegol +- updated to 2.9.90 +- removed outdated applnk, application, onlyshowin, capplets-dir, gnome2-dir, + categories and hal patches +- removed vfolder menu subpackage (from now separate package gnome-menus is + responsible for menus) +- rel. 0.1 Revision 1.137 2004/12/10 16:25:41 krzak - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.138&r2=1.139&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
