From patchwork Mon Oct 6 10:31:00 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalpak Shah X-Patchwork-Id: 2883 X-Patchwork-Delegate: tytso@mit.edu Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 71AABDDDE6 for ; Mon, 6 Oct 2008 21:31:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752333AbYJFKa6 (ORCPT ); Mon, 6 Oct 2008 06:30:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752419AbYJFKa6 (ORCPT ); Mon, 6 Oct 2008 06:30:58 -0400 Received: from sineb-mail-2.sun.com ([192.18.19.7]:59560 "EHLO sineb-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333AbYJFKa5 (ORCPT ); Mon, 6 Oct 2008 06:30:57 -0400 Received: from fe-apac-05.sun.com (fe-apac-05.sun.com [192.18.19.176] (may be forged)) by sineb-mail-2.sun.com (8.13.6+Sun/8.12.9) with ESMTP id m96AUsEW027181 for ; Mon, 6 Oct 2008 10:30:55 GMT Received: from conversion-daemon.mail-apac.sun.com by mail-apac.sun.com (Sun Java System Messaging Server 6.2-6.01 (built Apr 3 2006)) id <0K8B00501BQOJ300@mail-apac.sun.com> (original mail from Kalpak.Shah@Sun.COM) for linux-ext4@vger.kernel.org; Mon, 06 Oct 2008 18:30:54 +0800 (SGT) Received: from [129.150.32.249] by mail-apac.sun.com (Sun Java System Messaging Server 6.2-6.01 (built Apr 3 2006)) with ESMTPSA id <0K8B007VFBVCUHN9@mail-apac.sun.com>; Mon, 06 Oct 2008 18:30:54 +0800 (SGT) Date: Mon, 06 Oct 2008 16:01:00 +0530 From: Kalpak Shah Subject: [PATCH][1/15] e2fsprogs-specdotin.patch To: TheodoreTso Cc: linux-ext4 Message-id: <1223289060.4007.81.camel@localhost> MIME-version: 1.0 X-Mailer: Evolution 2.8.3 (2.8.3-2.fc6) Content-type: multipart/mixed; boundary="Boundary_(ID_+AnHuhzbgdBorP52RQCwZA)" Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Add the distro version to the RPM release number, so that it the RPM names do not conflict. Allow the RPM built from upstream to replace the split packages provided by the distros. At some point in the future it may be desirable to also split the RPM built by this spec file, but this is complicated by the fact that SLES and RHEL have different splits. Signed-off-by: Girish Shilamkar Signed-off-by: Andreas Dilger Add the distro version to the RPM release number, so that it the RPM names do not conflict. Allow the RPM built from upstream to replace the split packages provided by the distros. At some point in the future it may be desirable to also split the RPM built by this spec file, but this is complicated by the fact that SLES and RHEL have different splits. Signed-off-by: Girish Shilamkar Signed-off-by: Andreas Dilger Index: e2fsprogs-1.40.5/e2fsprogs.spec.in =================================================================== --- e2fsprogs-1.40.5.orig/e2fsprogs.spec.in +++ e2fsprogs-1.40.5/e2fsprogs.spec.in @@ -6,13 +6,22 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: @E2FSPROGS_PKGVER@ -Release: 0 +Release: 0%{_vendor} License: GPLv2 Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz Url: http://e2fsprogs.sourceforge.net/ Prereq: /sbin/ldconfig BuildRoot: %{_tmppath}/%{name}-root +%if %{_vendor} == "suse" +Group: System/Filesystems +Provides: e2fsbn ext2fs libcom_err = %{version} +Obsoletes: ext2fs libcom_err < %{version} +%else +Group: System Environment/Base +Obsoletes: e2fsprogs-libs < %{version} +Provides: e2fsprogs-libs = %{version} +%endif %description The e2fsprogs package contains a number of utilities for creating,