From patchwork Thu Mar 31 01:49:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 8706841 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 21A5D9F3D1 for ; Thu, 31 Mar 2016 01:49:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46E0E20303 for ; Thu, 31 Mar 2016 01:49:54 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E10E20279 for ; Thu, 31 Mar 2016 01:49:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 842EE1A1FB8; Wed, 30 Mar 2016 18:50:22 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ml01.01.org (Postfix) with ESMTP id 5CD6B1A1FB8 for ; Wed, 30 Mar 2016 18:50:21 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 30 Mar 2016 18:49:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,419,1455004800"; d="scan'208";a="922235267" Received: from dwillia2-desk3.jf.intel.com ([10.54.39.14]) by orsmga001.jf.intel.com with ESMTP; 30 Mar 2016 18:49:50 -0700 Subject: [ndctl PATCH] ndctl: SUSE spec file fixups From: Dan Williams To: linux-nvdimm@lists.01.org Date: Wed, 30 Mar 2016 18:49:13 -0700 Message-ID: <20160331014913.32880.99267.stgit@dwillia2-desk3.jf.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Per recent build.opensuse.org results: 1/ The SLE_12 target still mandates use of %defattr 2/ The SUSE-rpmlint system now enforces license names from https://license.opensuse.org 3/ The libndctl version suffix needs to account for LIBNDCTL_AGE, not just LIBNDCTL_CURRENT. Signed-off-by: Dan Williams --- Makefile.am | 6 ++++-- ndctl.spec.in | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3f7dca3d37e8..7de3d3c3c9eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,12 +56,14 @@ CLEANFILES += $(noinst_SCRIPTS) do_rhel_subst = sed -e 's,VERSION,$(VERSION),g' \ -e 's,DNAME,ndctl-devel,g' \ - -e 's,LNAME,ndctl-libs,g' + -e '/^%defattr.*/d' \ + -e 's,LNAME,ndctl-libs,g' do_sles_subst = sed -e 's,VERSION,$(VERSION),g' \ -e 's,DNAME,libndctl-devel,g' \ -e 's,%license,%doc,g' \ - -e 's,LNAME,libndctl$(LIBNDCTL_CURRENT),g' + -e 's,\(^License:.*GPL\)v2,\1-2.0,g' \ + -e "s,LNAME,libndctl$$(($(LIBNDCTL_CURRENT) - $(LIBNDCTL_AGE))),g" rhel/ndctl.spec: ndctl.spec.in Makefile.am $(AM_V_GEN)$(MKDIR_P) rhel; $(do_rhel_subst) < $< > $@ diff --git a/ndctl.spec.in b/ndctl.spec.in index 6f6e99bd743b..e24b31cc54f0 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -65,16 +65,19 @@ make check %postun -n LNAME -p /sbin/ldconfig %files +%defattr(-,root,root) %license licenses/GPLv2 licenses/BSD-MIT licenses/CC0 %{_bindir}/ndctl %{_mandir}/man1/* %files -n LNAME +%defattr(-,root,root) %doc README.md %license COPYING licenses/BSD-MIT licenses/CC0 %{_libdir}/libndctl.so.* %files -n DNAME +%defattr(-,root,root) %license COPYING %{_includedir}/ndctl/ %{_libdir}/libndctl.so