Accepting request 105573 from home:elvigia:branches:Base:System

- move libraries back to %{_libdir}, /usr merge project

OBS-URL: https://build.opensuse.org/request/show/105573
OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=18

lzo.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 11 19:32:14 UTC 2012 - crrodriguez@opensuse.org
+
+- move libraries back to %{_libdir}, /usr merge project 
+
 -------------------------------------------------------------------
 Sun Sep 25 17:06:01 UTC 2011 - crrodriguez@opensuse.org
 

lzo.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lzo
 #
-# Copyright (c) 2011 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,14 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           lzo
 Url:            http://www.oberhumer.com/opensource/lzo/
 Version:        2.06
-Release:        1
+Release:        0
-Group:          Development/Libraries/C and C++
 Source:         lzo-%{version}.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -33,7 +30,8 @@ Obsoletes:      lzo-64bit
 %endif
 #
 Summary:        A Real-Time Data Compression Library
-License:        GPLv2
+License:        GPL-2.0
+Group:          Development/Libraries/C and C++
 
 %description
 LZO is a portable lossless data compression library written in ANSI C.
@@ -51,9 +49,8 @@ Authors:
 %define library_package liblzo2-2
 
 %package -n liblzo2-2
-License:        GPLv2
-Group:          Development/Libraries/C and C++
 Summary:        A Real-Time Data Compression Library
+Group:          Development/Libraries/C and C++
 Provides:       lzo = %{version}-%{release}
 Obsoletes:      lzo < %{version}
 # bug437293
@@ -76,10 +73,9 @@ Authors:
     Markus Franz Xaver Johannes Oberhumer <markus@oberhumer.com>
 
 %package devel
-License:        GPLv2
-Group:          Development/Languages/C and C++
 Requires:       %{library_package} = %{version}
 Summary:        Development files for lzo
+Group:          Development/Languages/C and C++
 # bug437293
 %ifarch ppc64
 Obsoletes:      lzo-devel-64bit
@@ -106,7 +102,6 @@ Authors:
 export CFLAGS="%optflags -fvisibility=hidden"
 %configure --enable-shared \
            --disable-static \
-           --libdir=/%{_lib} \
            --disable-silent-rules \
            --docdir=%{_docdir}/%{name}-devel
 
@@ -125,12 +120,7 @@ echo '#define __LZO_EXPORT1 __attribute__ ((visibility ("default")))' >> config.
 
 %install
 %makeinstall
-%{__rm} -v %{buildroot}/%{_lib}/liblzo2.la
+%{__rm} -v %{buildroot}%{_libdir}/liblzo2.la
-#
-%{__install} -d -m 0755 %{buildroot}%{_libdir}
-#%{__mv} -v %{buildroot}{/%{_lib},%{_libdir}}/liblzo2.so
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/liblzo2.so) %{buildroot}%{_libdir}/liblzo2.so
-%{__rm} -v %{buildroot}/%{_lib}/liblzo2.so
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -141,7 +131,7 @@ echo '#define __LZO_EXPORT1 __attribute__ ((visibility ("default")))' >> config.
 
 %files -n %{library_package}
 %defattr(-,root,root)
-/%{_lib}/liblzo2.so.*
+%{_libdir}/liblzo2.so.*
 
 %files devel
 %defattr (-,root,root)