rfc 1/2: specfile: use rpm macros where possible

rfc 1/2: specfile: use rpm macros where possible

[Jan Engelhardt]

parent d8a0f148be5b5ea67ee84c61201e98d345c14eda (v{3.0.0})
commit c32f9b41de79a420e0896d2d4321ce74235d26ce
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Wed Feb 11 17:52:53 2009 +0100

specfile: use rpm macros where possible

This way less places need to be changes (when a developer decides
to change it..) after the placeholders have been substituted.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 build/rpm/xfsprogs.spec.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/rpm/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index cf61225..d9b3f2e 100644
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -7,7 +7,7 @@ Packager: Silicon Graphics, Inc. <http://www.sgi.com/>
 BuildRoot: @build_root@ 
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 3.0.0
-Source: @pkg_name@-@pkg_version@.src.tar.gz
+Source: %name-%version.src.tar.gz
 License: GPL
 Vendor: Silicon Graphics, Inc.
 URL: http://oss.sgi.com/projects/xfs/
@@ -30,8 +30,8 @@ with the IRIX version of XFS.
 %package devel
 Summary: XFS filesystem-specific static libraries and headers.
 Group: Development/Libraries
-Requires: @pkg_name@ >= 3.0.0
-Conflicts: @pkg_name@ < 3.0.0
+Requires: %name >= 3.0.0
+Conflicts: %name < 3.0.0
 
 %description devel
 xfsprogs-devel contains the libraries and header files needed to
-- 
# Created with git-export-patch

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

rfc 2/2: specfile: remove Distribution tag

[Jan Engelhardt]

parent c32f9b41de79a420e0896d2d4321ce74235d26ce (v{3.0.0}-1-gc32f9b4)
commit 4ee2e6de88b43bc9b4e1cc5a59cee264afd14123
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Wed Feb 11 17:54:05 2009 +0100

specfile: remove Distribution tag

There exist a number of rpm specfile tags that make it possible to
mislead users of the produced RPM package, because its presence
overrides anything that has been specified in ~/.rpmmacros (or the
configuration files of the build system used). Such is especially
annoying when Packager:/Vendor: is put in specfiles, because it is
then almost impossible to get the name/email of the person who
_really_ did the packaging (assuming s/he set it in their
.rpmmacros).

Such similarly applies to the Distribution: tag, which is why I
suggest its removal and let the build systems provide the proper
string instead.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 build/rpm/xfsprogs.spec.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/build/rpm/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index d9b3f2e..ab773dd 100644
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -2,7 +2,6 @@ Summary: Utilities for managing the XFS filesystem.
 Name: @pkg_name@
 Version: @pkg_version@
 Release: @pkg_release@
-Distribution: @pkg_distribution@
 Packager: Silicon Graphics, Inc. <http://www.sgi.com/>
 BuildRoot: @build_root@ 
 Prereq: /sbin/ldconfig
-- 
# Created with git-export-patch

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: rfc 1/2: specfile: use rpm macros where possible

[Eric Sandeen]

Jan Engelhardt wrote:
> parent d8a0f148be5b5ea67ee84c61201e98d345c14eda (v{3.0.0})
> commit c32f9b41de79a420e0896d2d4321ce74235d26ce
> Author: Jan Engelhardt <jengelh@medozas.de>
> Date:   Wed Feb 11 17:52:53 2009 +0100
> 
> specfile: use rpm macros where possible
> 
> This way less places need to be changes (when a developer decides
> to change it..) after the placeholders have been substituted.
> 
> Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
> ---

Fine by me, though I never use the specfile (who does?)

I figure most distros have their own specfile to accomodate
distro-specific policies, macros, etc.

-Eric

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: rfc 1/2: specfile: use rpm macros where possible

[Christoph Hellwig]

Thanks, I'll put these in.  Can you submit equivalent patches for
xfsdump and dmapi, too?

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: rfc 1/2: specfile: use rpm macros where possible

[Jan Engelhardt]

On Sunday 2009-02-15 18:24, Christoph Hellwig wrote:

>Thanks, I'll put these in.  Can you submit equivalent patches for
>xfsdump and dmapi, too?
>
xfsdump and dmapi git repositories seem to have no .spec files.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: rfc 1/2: specfile: use rpm macros where possible

[Christoph Hellwig]

On Thu, Feb 19, 2009 at 04:25:20PM +0100, Jan Engelhardt wrote:
> On Sunday 2009-02-15 18:24, Christoph Hellwig wrote:
> 
> >Thanks, I'll put these in.  Can you submit equivalent patches for
> >xfsdump and dmapi, too?
> >
> xfsdump and dmapi git repositories seem to have no .spec files.

build/rpm/xfsdump.spec.in and build/rpm/dmapi.spec.in

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

xfsdump: specfile: remove Distribution/Packager tag

[Jan Engelhardt]

On Tuesday 2009-02-24 20:07, Christoph Hellwig wrote:
>On Thu, Feb 19, 2009 at 04:25:20PM +0100, Jan Engelhardt wrote:
>> On Sunday 2009-02-15 18:24, Christoph Hellwig wrote:
>> 
>> >Thanks, I'll put these in.  Can you submit equivalent patches for
>> >xfsdump and dmapi, too?
>> >
>> xfsdump and dmapi git repositories seem to have no .spec files.
>
>build/rpm/xfsdump.spec.in and build/rpm/dmapi.spec.in


parent b7b66942273709925184998fb08283e279e0366f ()
commit 0ba9509a63079457a356c07017ad0591968c3ae2
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Wed Feb 25 11:13:03 2009 +0100

specfile: remove Distribution/Packager tag

There exist a number of rpm specfile tags that make it possible to
mislead users of the produced RPM package, because its presence
overrides anything that has been specified in ~/.rpmmacros (or the
configuration files of the build system used). Such is especially
annoying when Packager:/Vendor: is put in specfiles, because it is
then almost impossible to get the name/email of the person who
_really_ did the packaging (assuming s/he set it in their
.rpmmacros).

Such similarly applies to the Distribution: tag, which is why I
suggest its removal and let the build systems provide the proper
string instead.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 build/rpm/xfsdump.spec.in |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/build/rpm/xfsdump.spec.in b/build/rpm/xfsdump.spec.in
index 417dd84..59a6bb1 100644
--- a/build/rpm/xfsdump.spec.in
+++ b/build/rpm/xfsdump.spec.in
@@ -2,8 +2,6 @@ Summary: Administrative utilities for the XFS filesystem.
 Name: @pkg_name@
 Version: @pkg_version@
 Release: @pkg_release@
-Distribution: @pkg_distribution@
-Packager: Silicon Graphics, Inc. <http://www.sgi.com/>
 BuildRoot: @build_root@ 
 Requires: xfsprogs >= 3.0.0, attr >= 2.0.0
 Source: @pkg_name@-@pkg_version@.src.tar.gz
-- 
# Created with git-export-patch

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

dmapi: specfile: remove Distribution/Packager tag

[Jan Engelhardt]

parent e88a1b61f0258b51a1d0c99991cc25b28fddd1a8 ()
commit 9db3ece5fd5dc3265f28869140be262f16ef95ac
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Wed Feb 25 11:15:51 2009 +0100

specfile: remove Distribution/Packager tag; use rpm macros

There exist a number of rpm specfile tags that make it possible to
mislead users of the produced RPM package, because its presence
overrides anything that has been specified in ~/.rpmmacros (or the
configuration files of the build system used). Such is especially
annoying when Packager:/Vendor: is put in specfiles, because it is
then almost impossible to get the name/email of the person who
_really_ did the packaging (assuming s/he set it in their
.rpmmacros).

Such similarly applies to the Distribution: tag, which is why I
suggest its removal and let the build systems provide the proper
string instead.

Also make use of rpm macros in one place.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 build/rpm/dmapi.spec.in |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in
index a0c5de6..22832da 100644
--- a/build/rpm/dmapi.spec.in
+++ b/build/rpm/dmapi.spec.in
@@ -2,8 +2,6 @@ Summary: Data Management API runtime environment.
 Name: @pkg_name@
 Version: @pkg_version@
 Release: @pkg_release@
-Distribution: @pkg_distribution@
-Packager: Silicon Graphics, Inc. <http://www.sgi.com/>
 BuildRoot: @build_root@
 Prereq: /sbin/ldconfig
 Conflicts: xfsdump < 2.0.0
@@ -23,7 +21,7 @@ by the libdm library.
 %package devel
 Summary: Data Management API static libraries and headers.
 Group: Development/Libraries
-Requires: @pkg_name@ >= 2.0.4 xfsprogs-devel
+Requires: %name >= 2.0.4 xfsprogs-devel
 
 %description devel
 dmapi-devel contains the libraries and header files needed to
-- 
# Created with git-export-patch

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: xfsdump: specfile: remove Distribution/Packager tag

[Christoph Hellwig]

Thanks, I've put both patches in.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs