From 0913d57f5e3f747ebe135d09390762125dbb89fb2bd0c4c6b632ae0918c99afc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 15 Apr 2013 12:23:08 +0000 Subject: [PATCH] Accepting request 164115 from home:namtrac:bugfix - Add Source URL, see https://en.opensuse.org/SourceUrls OBS-URL: https://build.opensuse.org/request/show/164115 OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=38 --- pciutils.changes | 5 +++++ pciutils.spec | 42 +++++++++++++++--------------------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/pciutils.changes b/pciutils.changes index f95a8d4..78aec6d 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 15 12:09:40 UTC 2013 - idonmez@suse.com + +- Add Source URL, see https://en.opensuse.org/SourceUrls + ------------------------------------------------------------------- Mon Dec 31 14:44:58 UTC 2012 - crrodriguez@opensuse.org diff --git a/pciutils.spec b/pciutils.spec index a257cda..df5c946 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,7 +1,7 @@ # # spec file for package pciutils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,14 +28,14 @@ Requires: pciutils-ids Obsoletes: pciutils-64bit %endif # -Summary: PCI utilities for Kernel version 2.2 and newer +Summary: PCI utilities for Kernel version 2 License: GPL-2.0+ Group: Hardware/Other Url: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml -Source: %{name}-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.bz2 Source1: COPYING Source2: baselibs.conf -Patch: update-pciutils-dist +Patch0: update-pciutils-dist Patch1: %{name}-%{version}_pkgconfig.patch Patch2: pciutils-ocloexec.patch Patch3: pciutils-endianh.patch @@ -52,12 +52,6 @@ with it. update-pciids: This program downloads the current version of the pci.ids file. - - -Authors: --------- - Martin Mares - %package -n %lname Summary: PCI utility library Group: System/Libraries @@ -72,35 +66,29 @@ Group: Development/Libraries/C and C++ %ifarch ppc64 Obsoletes: pciutils-devel-64bit %endif -Requires: %lname = %version +Requires: %lname = %{version} %description devel This package contains the files that are necessary for software development using the PCI utilities. - - -Authors: --------- - Martin Mares - %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 %build -make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS -D_GNU_SOURCE $(getconf LFS_CFLAGS) -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" +make %{?_smp_mflags} OPT="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS) -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" %install -make install PREFIX=$RPM_BUILD_ROOT%{_prefix} SBINDIR=$RPM_BUILD_ROOT/sbin \ - ROOT=$RPM_BUILD_ROOT/ MANDIR=$RPM_BUILD_ROOT/%{_mandir} STRIP="" \ - SHARED="yes" LIBDIR=$RPM_BUILD_ROOT/%{_lib} -mkdir -p $RPM_BUILD_ROOT%{_includedir}/pci -cp -p lib/{pci,header,config,types}.h $RPM_BUILD_ROOT%{_includedir}/pci/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/pci.ids* -install -D -m 0644 lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libpci.pc +make install PREFIX=%{buildroot}%{_prefix} SBINDIR=%{buildroot}/sbin \ + ROOT=%{buildroot}/ MANDIR=%{buildroot}/%{_mandir} STRIP="" \ + SHARED="yes" LIBDIR=%{buildroot}/%{_lib} +mkdir -p %{buildroot}%{_includedir}/pci +cp -p lib/{pci,header,config,types}.h %{buildroot}%{_includedir}/pci/ +rm -rf %{buildroot}%{_datadir}/pci.ids* +install -D -m 0644 lib/libpci.pc %{buildroot}%{_libdir}/pkgconfig/libpci.pc ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so %post -n %lname -p /sbin/ldconfig @@ -115,7 +103,7 @@ ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so %files -n %lname %defattr(-,root,root) -/%_lib/libpci.so.* +/%{_lib}/libpci.so.* %files devel %defattr(-, root, root)