https://bugzilla.redhat.com/show_bug.cgi?id=1333529



--- Comment #26 from Honggang LI <ho...@redhat.com> ---
(In reply to Scott Breyer from comment #23)
> Created attachment 1555632 [details]
> Updated spec file

 cat -n opa-fm.spec 
     1  # BEGIN_ICS_COPYRIGHT8 ****************************************
     2  # 
     3  # Copyright (c) 2015-2018, Intel Corporation
     4  # 
     5  # Redistribution and use in source and binary forms, with or without
     6  # modification, are permitted provided that the following conditions
are met:
     7  # 
     8  #     * Redistributions of source code must retain the above copyright
notice,
     9  #       this list of conditions and the following disclaimer.
    10  #     * Redistributions in binary form must reproduce the above
copyright
    11  #       notice, this list of conditions and the following disclaimer in
the
    12  #       documentation and/or other materials provided with the
distribution.
    13  #     * Neither the name of Intel Corporation nor the names of its
contributors
    14  #       may be used to endorse or promote products derived from this
software
    15  #       without specific prior written permission.
    16  # 
    17  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS"
    18  # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE
    19  # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE
    20  # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE
    21  # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
    22  # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR
    23  # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER
    24  # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY,
    25  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE
    26  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    27  # 
    28  # END_ICS_COPYRIGHT8   ****************************************
    29  
    30  #[ICS VERSION STRING: unknown]


I removed line 1 - 30. As we have a LICENSE file in the top directory of the
source code.


    31  Name: opa-fm
    32  Version: 10.9.1.1
    33  Release: 1%{?dist}

    34  %if 0%{?rhel}
    35  Epoch: 1
    36  %endif

I deleted line 34-36, as rhelX will not use this spec file.

    37  Summary: Intel Omni-Path Fabric Management Software
    38  
    39  License: BSD
    40  Url: https://github.com/intel/opa-fm
    41  # tarball created by:
    42  # git clone https://github.com/01org/opa-fm.git

line 42 uses a outdated url.

    43  # cd opa-fm
    44  # tar czf opa-fm.tar.gz --exclude-cvs .

I deleted line 41-44, as I have to rename the source tarball. See previous
comment for explanation.

    45  Source0: %{name}.tar.gz
    46  ExclusiveArch: x86_64
    47  # The Intel OPA product line is only available on x86_64 platforms at
this time.
    48  
    49  Requires: rdma

line 49 is no longer needed.


    50  
    51  BuildRequires: expat-devel, rdma-core-devel, openssl-devel
    52  BuildRequires: gcc
    53  BuildRequires: gcc-c++
    54  BuildRequires: python-unversioned-command
    55  BuildRequires: zlib-devel
    56  
    57  BuildRequires: systemd %{?systemd_requires} %{?BuildRequires}
    58  Requires: systemd %{?systemd_requires}
    59  Requires: libibumad%{?_isa}, libibverbs%{?_isa}, rdma, expat%{?_isa},
libhfi1, openssl%{?_isa}

line 57-59 had been deleted, only libhfi1 and %{?systemd_requires} kept. The
rpm building tool will
handle those dependency for us. So, no need to explicitly state them.

    60  
    61  %description
    62  The %{name} contains Intel Omni-Path fabric management applications.
This 

replace %{name} in line 62 with opa-fm.

    63  includes: the Subnet Manager, Baseboard Manager, Performance Manager, 
    64  Fabric Executive, and some fabric management tools.
    65  IFSComponent: FM 10.9.1.1.1%{?dist}

remove %{dist} in line 65.

    66  
    67  %prep
    68  %setup -q -c
    69  
    70  %build
    71  cd Esm
    72  OPA_FEATURE_SET= ./fmbuild $BUILD_ARGS

line 71 and 72 use hardcode compiler flags. I fixed it.

    73  
    74  %install
    75  BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_libdir} RPM_INS=n
./Esm/fm_install.sh
    76  mkdir -p %{buildroot}/%{_localstatedir}/usr/lib/opa-fm/
    77  
    78  %post
    79  if [ $1 = 1 ]; then
    80          if [ $(command -v systemctl) ]; then
    81                  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
    82          else
    83                  /sbin/chkconfig --add opafm
    84          fi
    85  fi
    86  %preun
    87  if [ $1 = 1 ] || [ $1 = 0 ]; then
    88          if [ $(command -v systemctl) ]; then
    89                  systemctl stop opafm.service >/dev/null 2>&1 || :
    90          else
    91                  /sbin/chkconfig --del opafm
    92          fi
    93  fi
    94  


line 78 - 94 is unnecessary complex, as fedora no longer use init scripts. I
fix this too.

    95  %files
    96  %doc Esm/README 
    97  

I add the LINCENSE file.

    98  /usr/lib/systemd/system/opafm.service
    99  %config(noreplace) %{_sysconfdir}/opa-fm/opafm.xml
   100  %config(noreplace) %{_sysconfdir}/opa-fm/opafm_pp.xml
   101  %{_sysconfdir}/opa-fm/vfs
   102  %{_sysconfdir}/opa-fm/dgs
   103  /usr/lib/opa-fm/bin/*
   104  /usr/lib/opa-fm/runtime/*
   105  /usr/share/opa-fm/*
   106  %{_sbindir}/opafmcmd
   107  %{_sbindir}/opafmcmdall
   108  %{_sbindir}/opafmconfigpp
   109  %{_sbindir}/opafmvf
   110  %{_mandir}/man8/*

I remove hardcode path.

   111  
   112  %changelog
   113  * Mon Feb 26 2018 Jijun Wang <jijun.w...@intel.com> - 10.8.0.0
   114  - Added epoch for RHEL
   115  - Added component information in description
   116  * Thu Oct 09 2014 Kaike Wan <kaike....@intel.com> - 10.0.0.0-177
   117  - Initial version
   118  
   119  

I replace the changelog.

Please conside use this updated spec file:
http://people.redhat.com/honli/opa-fm-10.9.1.1-1-review/opa-fm.spec

I also upload renamed tarball and a dummy manpage patch in here:
http://people.redhat.com/honli/opa-fm-10.9.1.1-1-review/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component
_______________________________________________
package-review mailing list -- package-review@lists.fedoraproject.org
To unsubscribe send an email to package-review-le...@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/package-review@lists.fedoraproject.org

Reply via email to