From c045c66365c09d962df96477294d1918c5499301fdb78c307829084762d9df86 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:23:56 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libgpg-error revision 26.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=298a1f8e42b5f559575b94a369f43a70 --- libgpg-error.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libgpg-error.spec b/libgpg-error.spec index 8e14d0a..aee0f97 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -20,7 +20,7 @@ Name: libgpg-error Version: 1.10 Release: 1 -License: GPLv2+ ; LGPLv2.1+ +License: GPL-2.0+ ; LGPL-2.1+ Summary: Library That Defines Common Error Values for All GnuPG Components Url: http://www.gnupg.org/ Group: Development/Libraries/C and C++ @@ -38,7 +38,7 @@ components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon, and possibly more in the future. %package -n libgpg-error0 -License: GPLv2+ ; LGPLv2.1+ +License: GPL-2.0+ ; LGPL-2.1+ Summary: Library That Defines Common Error Values for All GnuPG Components Group: Development/Libraries/C and C++ # bug437293 @@ -55,7 +55,7 @@ components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, pinentry, SmartCard Daemon, and possibly more in the future. %package devel -License: GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) +License: GPL-2.0+ ; LGPL-2.1+ ; MIT Summary: Development package for libgpg-error Group: Development/Libraries/C and C++ # bug437293 From a67dee7200ef399b5512ef54d506941e341d16dc995de1872417ae861e67be24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 12 Feb 2012 22:26:04 +0000 Subject: [PATCH 2/2] 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 --- libgpg-error.changes | 5 +++++ libgpg-error.spec | 22 +++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libgpg-error.changes b/libgpg-error.changes index 06f724c..b2fe6be 100644 --- a/libgpg-error.changes +++ b/libgpg-error.changes @@ -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 diff --git a/libgpg-error.spec b/libgpg-error.spec index aee0f97..9450ad5 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: libgpg-error Version: 1.10 -Release: 1 -License: GPL-2.0+ ; LGPL-2.1+ +Release: 0 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++ +Url: http://www.gnupg.org/ Source: %name-%version.tar.bz2 Source2: baselibs.conf # 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. %package -n libgpg-error0 -License: GPL-2.0+ ; LGPL-2.1+ Summary: Library That Defines Common Error Values for All GnuPG Components +License: GPL-2.0+ ; LGPL-2.1+ Group: Development/Libraries/C and C++ # bug437293 %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. %package devel -License: GPL-2.0+ ; LGPL-2.1+ ; MIT Summary: Development package for libgpg-error +License: GPL-2.0+ ; LGPL-2.1+ ; MIT Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -80,15 +79,12 @@ Files needed for software development using libgpg-error. %build autoreconf -fiv -%configure --disable-static --with-pic --libdir=/%{_lib} +%configure --disable-static --with-pic make %{?_smp_mflags} %install %make_install -rm %{buildroot}/%{_lib}/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 +rm %{buildroot}%{_libdir}/libgpg-error.la # Drop the lisp stuff, it depends on ASDF and CFFI # which needs to be packaged first rm -r %{buildroot}%{_datadir}/common-lisp @@ -103,7 +99,7 @@ rm -rf %{buildroot} %files -n libgpg-error0 -f %{name}.lang %defattr(-,root,root) -/%{_lib}/libgpg-error*.so.* +%{_libdir}/libgpg-error*.so.* %files devel %defattr(-,root,root)