[openib-general] Please don't commit without maintainer approval

[Roland Dreier]

Bryan, I reverted the changes below, which you checked into the trunk
with the comment "update spec file from 1.0 branch."  I think it's
inappropriate to commit without even giving a heads up to the
maintainer.  If you had asked, I would have explained why these
changes are wrong:

 - the version macro shouldn't be used for the source tarball name,
   because that doesn't work out right for -rc snapshots.

 - I've not tried it to see for sure, but I can't imagine that
   depending on <sysfs/libsysfs.h> instead of a package name works
   properly either for autobuilders or automatic dependency tracking
   in yum, etc.

 - the rest of the changes look like fiddling for no reason
   (reordering lines, changing buildroot away from the preferred
   Fedora value, etc)

And finally, this development process is completely backwards.
Changes shouldn't be made first on the release branch and then merged
to the trunk.  All fixes should go into the trunk first with
maintainer approval, and then a selected subset should be merged onto
the release branch.

 - R.

--- libibverbs/libibverbs.spec.in	(revision 6293)
+++ libibverbs/libibverbs.spec.in	(revision 6294)
@@ -1,19 +1,20 @@
 # $Id$
 
-%define ver      @VERSION@
+%define ver @VERSION@
+%define RELEASE 1
+%define repl %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
 Name: libibverbs
 Version: 1.0.3
-Release: 1%{?dist}
+Release: %rel%{?dist}
 Summary: A library for direct userspace use of InfiniBand
-
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0.3.tar.gz
+Source: http://openib.org/downloads/libibverbs-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: sysfsutils-devel
+BuildRequires: %{_includedir}/sysfs/libsysfs.h
 
 %description
 libibverbs is a library that allows userspace processes to use
@@ -27,7 +28,7 @@ also be installed.
 %package devel
 Summary: Development files for the libibverbs library
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} sysfsutils-devel
+Requires: %{name} = %{version}-%{release} %{_includedir}/sysfs/libsysfs.h
 
 %description devel
 Static libraries and header files for the libibverbs verbs library.
--- srptools/srptools.spec.in	(revision 6300)
+++ srptools/srptools.spec.in	(revision 6301)
@@ -1,24 +1,25 @@
 # $Id$
 
-%define ver      @VERSION@
+%define ver @VERSION@
+%define RELEASE 1
+%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
+Summary: Tools for SRP/IB
 Name: srptools
 Version: %ver
-Release: 1%{?dist}
-Summary: Tools for SRP/IB
-
-Group: Applications/System
+Release: %rel%{?dist}
 License: GPL/BSD
-Url: http://openib.org/
+Group: Applications/System
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Url: http://openib.org/
 
 %description
 In conjunction with the kernel ib_srp driver, srptools allows you to
 discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
 
 %prep
-%setup -q -n %{name}-%{ver}
+%setup -q
 
 %build
 %configure
@@ -38,5 +39,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Apr 06 2006 Bryan O'Sullivan <bos at pathscale.com> - @VERSION at -1
+- Merge spec file from 1.0 branch with spec file from mainline
+
 * Tue Mar 21 2006 Roland Dreier <rdreier at cisco.com> - @VERSION at -1
 - Initial attempt at a working spec file