From edad8bfa7d998543413611279cdef8c7688f5316 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jan 25 2011 18:12:04 +0000 Subject: Split off fileroller-nautilus --- diff --git a/file-roller.spec b/file-roller.spec index f30c3d2..0ff0f12 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -1,56 +1,53 @@ -%define glib2_version 2.16.0 -%define gtk3_version 2.99.0 -%define pango_version 1.8.0 -%define libgnomeui_version 2.6.0 -%define libgnomeprint_version 2.2.0 -%define libgnomeprintui_version 2.2.0 -%define desktop_file_utils_version 0.9 -%define nautilus_version 2.22.2 -%define gnome_doc_utils_version 0.3.2 - -Summary: Tool for viewing and creating archives -Name: file-roller -Version: 2.91.5 -Release: 1%{?dist} -License: GPLv2+ -Group: Applications/Archiving -URL: http://download.gnome.org/sources/file-roller/ +Summary: Tool for viewing and creating archives +Name: file-roller +Version: 2.91.5 +Release: 2%{?dist} +License: GPLv2+ +Group: Applications/Archiving +URL: http://download.gnome.org/sources/file-roller/ #VCS: git:git://git.gnome.org/file-roller -Source: http://download.gnome.org/sources/file-roller/2.91/file-roller-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/file-roller/2.91/file-roller-%{version}.tar.bz2 -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: glib2-devel +BuildRequires: pango-devel +BuildRequires: gtk3-devel >= 2.99 BuildRequires: libglade2-devel -BuildRequires: nautilus-devel >= %{nautilus_version} +BuildRequires: nautilus-devel BuildRequires: libtool BuildRequires: gettext BuildRequires: libSM-devel -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} +BuildRequires: desktop-file-utils +BuildRequires: gnome-doc-utils BuildRequires: intltool BuildRequires: GConf2-devel Requires(pre): GConf2 -Requires(post): /usr/bin/gtk-update-icon-cache -Requires(postun): /usr/bin/gtk-update-icon-cache -# The context menu API changed in 2.2.0: -Conflicts: nautilus < 2.2.0 %description File Roller is an application for creating and viewing archives files, such as tar or zip files. + +%package nautilus +Summary: File Roller extension for nautilus +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} + +%description nautilus +This package contains the file-roller extension for the nautilus file manger. +It adds an item to the nautilus contexst menu that lets you compress files +or directories. + %prep %setup -q %build -%configure --disable-scrollkeeper \ - --disable-static \ +%configure --disable-scrollkeeper \ + --disable-static \ --with-gtk=3.0 \ - --enable-nautilus-actions \ - --enable-packagekit + --enable-nautilus-actions \ + --enable-packagekit export tagname=CC make LIBTOOL=/usr/bin/libtool @@ -97,7 +94,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %{_bindir}/file-roller %{_datadir}/file-roller %{_datadir}/applications/gnome-file-roller.desktop -%{_libdir}/nautilus/extensions-3.0/libnautilus-fileroller.so %{_libexecdir}/file-roller %{_libexecdir}/file-roller-server %{_datadir}/dbus-1/services/org.gnome.FileRoller.service @@ -107,7 +103,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || : %{_datadir}/GConf/gsettings/file-roller.convert +%files nautilus +%{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.so + + %changelog +* Tue Jan 25 2011 Matthias Clasen 2.91.5-2 +- Drop ancient version requirements +- Drop prehistoric conflict +- Split off a -nautilus subpackage + * Mon Jan 10 2011 Matthias Clasen 2.91.5-1 - Update to 2.91.5