From 61cc5494d8f867700d77489f3026e242f5ab236c9cf184acb3be163d4c07ee1a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 17 Feb 2012 19:15:38 +0000 Subject: [PATCH] Accepting request 105579 from home:elvigia:branches:Base:System - Libraries are back to %{_libdir}, /usr merge project OBS-URL: https://build.opensuse.org/request/show/105579 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysfsutils?expand=0&rev=10 --- sysfsutils.changes | 5 +++++ sysfsutils.spec | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sysfsutils.changes b/sysfsutils.changes index 5dff837..fd95e9f 100644 --- a/sysfsutils.changes +++ b/sysfsutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 16 20:11:00 UTC 2012 - crrodriguez@opensuse.org + +- Libraries are back to %{_libdir}, /usr merge project + ------------------------------------------------------------------- Tue Sep 7 20:16:50 UTC 2010 - aj@suse.de diff --git a/sysfsutils.spec b/sysfsutils.spec index 357142e..b19a002 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -1,7 +1,7 @@ # -# spec file for package sysfsutils (Version 2.1.0) +# spec file for package sysfsutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: sysfsutils Summary: System Utilities Package / Libsysfs -Version: 2.1.0 -Release: 138 -License: LGPLv2.1+ +License: LGPL-2.1+ Group: System/Libraries +Version: 2.1.0 +Release: 0 Url: http://linux-diag.sourceforge.net Source: http://aleron.dl.sourceforge.net/sourceforge/linux-diag/%{name}-%{version}.tar.gz Source2: baselibs.conf @@ -51,7 +49,6 @@ Authors: %package devel Summary: Development files for libsysfs -License: LGPLv2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -67,16 +64,12 @@ This package contains the development files for libsysfs. %setup -q %build -%configure --disable-static --with-pic --libdir=/%{_lib} +%configure --disable-static --with-pic %{__make} %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -# create devel symlink in /usr -mkdir -p %{buildroot}%{_libdir} -%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libsysfs.so) %{buildroot}%{_libdir}/libsysfs.so -%{__rm} -v %{buildroot}/%{_lib}/libsysfs.so -%{__rm} -v %{buildroot}/%{_lib}/libsysfs.la +%{__rm} -v %{buildroot}/%{_libdir}/libsysfs.la # don't install the tools rm -f %{buildroot}/%{_bindir}/dlist_test rm -f %{buildroot}/%{_bindir}/get_device @@ -95,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) /usr/bin/systool %{_mandir}/man1/systool.1.gz -/%{_lib}/libsysfs.so.* +%{_libdir}/libsysfs.so.* %doc README ChangeLog %files devel