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

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

OBS-URL: https://build.opensuse.org/request/show/104175
OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=18
This commit is contained in:
Cristian Rodríguez 2012-02-12 22:26:04 +00:00 committed by Git OBS Bridge
parent c045c66365
commit a67dee7200
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Feb 12 21:31:41 UTC 2012 - crrodriguez@opensuse.org
- Move libraries back to %{_libdir}, /usr merge project
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 19 15:56:17 UTC 2011 - coolo@suse.com Sat Nov 19 15:56:17 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libgpg-error # spec file for package libgpg-error
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,13 @@
# #
Name: libgpg-error Name: libgpg-error
Version: 1.10 Version: 1.10
Release: 1 Release: 0
License: GPL-2.0+ ; LGPL-2.1+
Summary: Library That Defines Common Error Values for All GnuPG Components Summary: Library That Defines Common Error Values for All GnuPG Components
Url: http://www.gnupg.org/ License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Url: http://www.gnupg.org/
Source: %name-%version.tar.bz2 Source: %name-%version.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
# rename package to "libgpg-error-nld" and set this to 1 for NLD # rename package to "libgpg-error-nld" and set this to 1 for NLD
@ -38,8 +37,8 @@ components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
pinentry, SmartCard Daemon, and possibly more in the future. pinentry, SmartCard Daemon, and possibly more in the future.
%package -n libgpg-error0 %package -n libgpg-error0
License: GPL-2.0+ ; LGPL-2.1+
Summary: Library That Defines Common Error Values for All GnuPG Components Summary: Library That Defines Common Error Values for All GnuPG Components
License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -55,8 +54,8 @@ components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
pinentry, SmartCard Daemon, and possibly more in the future. pinentry, SmartCard Daemon, and possibly more in the future.
%package devel %package devel
License: GPL-2.0+ ; LGPL-2.1+ ; MIT
Summary: Development package for libgpg-error Summary: Development package for libgpg-error
License: GPL-2.0+ ; LGPL-2.1+ ; MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -80,15 +79,12 @@ Files needed for software development using libgpg-error.
%build %build
autoreconf -fiv autoreconf -fiv
%configure --disable-static --with-pic --libdir=/%{_lib} %configure --disable-static --with-pic
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%make_install %make_install
rm %{buildroot}/%{_lib}/libgpg-error.la rm %{buildroot}%{_libdir}/libgpg-error.la
mkdir -p %{buildroot}%{_libdir}
ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
rm -v %{buildroot}/%{_lib}/%{name}.so
# Drop the lisp stuff, it depends on ASDF and CFFI # Drop the lisp stuff, it depends on ASDF and CFFI
# which needs to be packaged first # which needs to be packaged first
rm -r %{buildroot}%{_datadir}/common-lisp rm -r %{buildroot}%{_datadir}/common-lisp
@ -103,7 +99,7 @@ rm -rf %{buildroot}
%files -n libgpg-error0 -f %{name}.lang %files -n libgpg-error0 -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
/%{_lib}/libgpg-error*.so.* %{_libdir}/libgpg-error*.so.*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)