From 45180f7d930570cefeec6649d0746cb3d52458af20b6fd16aabf9f84ac06bf59 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 15 Feb 2012 15:15:48 +0000
Subject: [PATCH] Accepting request 104137 from devel:libraries:c_c++

- Move library back to %{_libdir}, /usr merge project. (forwarded request 103816 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/104137
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdaemon?expand=0&rev=22
---
 libdaemon.changes | 11 +++++++++++
 libdaemon.spec    | 27 ++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/libdaemon.changes b/libdaemon.changes
index 9da5392..a117c4d 100644
--- a/libdaemon.changes
+++ b/libdaemon.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Feb 11 19:25:52 UTC 2012 - crrodriguez@opensuse.org
+
+- Move library back to %{_libdir}, /usr merge project. 
+
+-------------------------------------------------------------------
+Wed Feb  1 02:41:49 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections per specfile guideline suggestions
+- Parallel building using %_smp_mflags
+
 -------------------------------------------------------------------
 Tue Oct  5 11:06:05 CEST 2010 - vuntz@opensuse.org
 
diff --git a/libdaemon.spec b/libdaemon.spec
index ff04f8a..f3e517c 100644
--- a/libdaemon.spec
+++ b/libdaemon.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libdaemon (Version 0.14)
+# spec file for package libdaemon
 #
-# 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,13 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           libdaemon
 Url:            http://0pointer.de/lennart/projects/libdaemon/
 Version:        0.14
-Release:        1
+Release:        0
 Summary:        Lightweight C library That Eases the Writing of UNIX Daemons
 License:        LGPL-2.1+
 Group:          System/Libraries
@@ -35,8 +33,8 @@ libdaemon is a lightweight C library that eases the writing of UNIX
 daemons.
 
 %package -n libdaemon0
-License:        LGPL-2.1+
 Summary:        Lightweight C library That Eases the Writing of UNIX Daemons
+License:        LGPL-2.1+
 Group:          System/Libraries
 Provides:       %{name} = %{version}
 #opensuse 10.3
@@ -47,8 +45,8 @@ libdaemon is a lightweight C library that eases the writing of UNIX
 daemons.
 
 %package devel
-License:        GPL-2.0+
 Summary:        Lightweight C library That Eases the Writing of UNIX Daemons
+License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
 Requires:       libdaemon0 = %{version}
 Requires:       glibc-devel
@@ -63,23 +61,14 @@ daemons.
 %build
 %configure \
         --disable-static --with-pic \
-        --libdir=/%{_lib} \
         --disable-lynx
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
-rm -f %{buildroot}/%{_lib}/libdaemon.la
+rm -f %{buildroot}%{_libdir}/libdaemon.la
 # We don't care about the HTML README
 rm %{buildroot}%{_datadir}/doc/libdaemon/{README.html,style.css}
-# Move back some files to /usr
-%{__install} -d -m 0755 %{buildroot}%{_libdir}/pkgconfig
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
-%{__rm} -v %{buildroot}/%{_lib}/%{name}.so
-%{__mv} -v %{buildroot}/%{_lib}/pkgconfig/%{name}.pc %{buildroot}%{_libdir}/pkgconfig
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post -n libdaemon0 -p /sbin/ldconfig
 
@@ -88,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libdaemon0
 %defattr (-,root,root)
 %doc LICENSE README
-/%{_lib}/libdaemon.so.0*
+%{_libdir}/libdaemon.so.0*
 
 %files devel
 %defattr (-,root,root)