From 74e5b9ab114ca198d85bcab286bc6027ca7c31e392c520536eb2fbf8e4990134 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 2 Nov 2010 12:18:05 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/lzo revision 14.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=ab448b1357293376dcd0c0da4567e374 --- lzo.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lzo.spec b/lzo.spec index b3afffa..b6df281 100644 --- a/lzo.spec +++ b/lzo.spec @@ -21,7 +21,7 @@ Name: lzo Url: http://www.oberhumer.com/opensource/lzo/ Version: 2.03 -Release: 6 +Release: 12 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 Source2: baselibs.conf @@ -104,6 +104,7 @@ Authors: %prep %setup -q %patch1 + %build export CFLAGS="%optflags -fvisibility=hidden" %configure --enable-shared --disable-static --libdir=/%{_lib} From 69bc8d83b1864b6166b9efc8c5a6f70ded7588c94c0f6bc6d7a549717cdfa2fb Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 12 Nov 2010 11:13:52 +0000 Subject: [PATCH 2/3] Accepting request 52910 from home:darix:branches:Base:System reviewed OBS-URL: https://build.opensuse.org/request/show/52910 OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=11 --- lzo-2.03-alias.patch | 78 -------------------------------------------- lzo-2.03.tar.bz2 | 3 -- lzo-2.04.tar.bz2 | 3 ++ lzo.changes | 11 +++++++ lzo.spec | 4 +-- 5 files changed, 15 insertions(+), 84 deletions(-) delete mode 100644 lzo-2.03-alias.patch delete mode 100644 lzo-2.03.tar.bz2 create mode 100644 lzo-2.04.tar.bz2 diff --git a/lzo-2.03-alias.patch b/lzo-2.03-alias.patch deleted file mode 100644 index 96559d7..0000000 --- a/lzo-2.03-alias.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: src/lzo_init.c -=================================================================== ---- src/lzo_init.c.orig 2008-04-30 14:51:49.000000000 +0200 -+++ src/lzo_init.c 2010-02-11 12:25:02.000000000 +0100 -@@ -90,8 +90,13 @@ LZO_PUBLIC(int) - _lzo_config_check(void) - { - lzo_bool r = 1; -- union { unsigned char c[2*sizeof(lzo_xint)]; lzo_xint l[2]; } u; -- lzo_uintptr_t p; -+ volatile union { -+ unsigned char c[2*sizeof(lzo_xint)]; -+ lzo_xint l[2]; -+ unsigned short s[2*sizeof(lzo_xint)/sizeof(unsigned short)]; -+ lzo_uint32 i[2*sizeof(lzo_xint)/sizeof(lzo_uint32)]; -+ } u; -+ const volatile unsigned char *p; - - #if !defined(LZO_CFG_NO_CONFIG_CHECK) - #if defined(LZO_ABI_BIG_ENDIAN) -@@ -103,14 +108,14 @@ _lzo_config_check(void) - r &= (u.l[0] == 128); - #endif - #if defined(LZO_UNALIGNED_OK_2) -- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0]; -+ p = &u.c[0]; - u.l[0] = u.l[1] = 0; -- r &= ((* (const lzo_ushortp) (p+1)) == 0); -+ r &= ((* (const volatile unsigned short *) (p+1)) == 0); - #endif - #if defined(LZO_UNALIGNED_OK_4) -- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0]; -+ p = &u.c[0]; - u.l[0] = u.l[1] = 0; -- r &= ((* (const lzo_uint32p) (p+1)) == 0); -+ r &= ((* (const volatile lzo_uint32 *) (p+1)) == 0); - #endif - #endif - -Index: minilzo/minilzo.c -=================================================================== ---- minilzo/minilzo.c.orig 2008-04-30 14:51:49.000000000 +0200 -+++ minilzo/minilzo.c 2010-02-11 12:25:08.000000000 +0100 -@@ -2444,8 +2444,13 @@ LZO_PUBLIC(int) - _lzo_config_check(void) - { - lzo_bool r = 1; -- union { unsigned char c[2*sizeof(lzo_xint)]; lzo_xint l[2]; } u; -- lzo_uintptr_t p; -+ volatile union { -+ unsigned char c[2*sizeof(lzo_xint)]; -+ lzo_xint l[2]; -+ unsigned short s[2*sizeof(lzo_xint)/sizeof(unsigned short)]; -+ lzo_uint32 i[2*sizeof(lzo_xint)/sizeof(lzo_uint32)]; -+ } u; -+ const volatile unsigned char *p; - - #if !defined(LZO_CFG_NO_CONFIG_CHECK) - #if defined(LZO_ABI_BIG_ENDIAN) -@@ -2457,14 +2462,14 @@ _lzo_config_check(void) - r &= (u.l[0] == 128); - #endif - #if defined(LZO_UNALIGNED_OK_2) -- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0]; -+ p = &u.c[0]; - u.l[0] = u.l[1] = 0; -- r &= ((* (const lzo_ushortp) (p+1)) == 0); -+ r &= ((* (const volatile unsigned short *) (p+1)) == 0); - #endif - #if defined(LZO_UNALIGNED_OK_4) -- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0]; -+ p = &u.c[0]; - u.l[0] = u.l[1] = 0; -- r &= ((* (const lzo_uint32p) (p+1)) == 0); -+ r &= ((* (const volatile lzo_uint32 *) (p+1)) == 0); - #endif - #endif - diff --git a/lzo-2.03.tar.bz2 b/lzo-2.03.tar.bz2 deleted file mode 100644 index b14f465..0000000 --- a/lzo-2.03.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75d657681fe57969a5ff629cbed6c7bffa2a54eacc49a68f830aa37de7897fc7 -size 462060 diff --git a/lzo-2.04.tar.bz2 b/lzo-2.04.tar.bz2 new file mode 100644 index 0000000..b187421 --- /dev/null +++ b/lzo-2.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:414bcb5361d50528723e20c154a776b2fa0d9c3a6e33cd6d0a4ef7b645fe5de1 +size 478581 diff --git a/lzo.changes b/lzo.changes index 73a7563..480ef1b 100644 --- a/lzo.changes +++ b/lzo.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Nov 12 11:09:42 UTC 2010 - mrueckert@suse.de + +- update to 2.0.4 + * Fixed a gcc-4.5 aliasing issue in lzo_init(). + * Updated the configure system. + * Assorted cleanups. +- dropped lzo-2.03-alias.patch: + solved differently upstream +- dropped debug_package_requires define + ------------------------------------------------------------------- Sat Oct 30 19:05:43 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/lzo.spec b/lzo.spec index b6df281..ce861c4 100644 --- a/lzo.spec +++ b/lzo.spec @@ -20,7 +20,7 @@ Name: lzo Url: http://www.oberhumer.com/opensource/lzo/ -Version: 2.03 +Version: 2.04 Release: 12 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 @@ -50,7 +50,6 @@ Authors: Markus Franz Xaver Johannes Oberhumer %define library_package liblzo2-2 -%define debug_package_requires %{library_package} = %{version}-%{release} %package -n liblzo2-2 License: GPLv2 @@ -103,7 +102,6 @@ Authors: %prep %setup -q -%patch1 %build export CFLAGS="%optflags -fvisibility=hidden" From 8aa12bd9373ffa562d5f4c76454a7161afb57a0757cb0a65cd849fc7c0bc0ad8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 22 Dec 2010 10:23:20 +0000 Subject: [PATCH 3/3] Accepting request 56595 from home:a_jaeger:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/56595 OBS-URL: https://build.opensuse.org/package/show/Base:System/lzo?expand=0&rev=12 --- lzo.changes | 5 +++++ lzo.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lzo.changes b/lzo.changes index 480ef1b..1708c06 100644 --- a/lzo.changes +++ b/lzo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 22 03:29:01 UTC 2010 - aj@suse.de + +- Fix specfile (remove deleted lzo-2.03-alias.patch). + ------------------------------------------------------------------- Fri Nov 12 11:09:42 UTC 2010 - mrueckert@suse.de diff --git a/lzo.spec b/lzo.spec index ce861c4..363d2c6 100644 --- a/lzo.spec +++ b/lzo.spec @@ -25,7 +25,6 @@ Release: 12 Group: Development/Libraries/C and C++ Source: lzo-%{version}.tar.bz2 Source2: baselibs.conf -Patch1: lzo-2.03-alias.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # bug437293