From 7ce47dc2bbcf337cb5af49990b3b7df5a416036d4005a6ddc682f697d6cfe955 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 27 Feb 2017 15:48:36 +0000 Subject: [PATCH 1/4] . OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libzio?expand=0&rev=28 --- libzio-1.02.tar.bz2 | 3 --- libzio-1.03.tar.bz2 | 3 +++ libzio.changes | 5 +++++ libzio.spec | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 libzio-1.02.tar.bz2 create mode 100644 libzio-1.03.tar.bz2 diff --git a/libzio-1.02.tar.bz2 b/libzio-1.02.tar.bz2 deleted file mode 100644 index ebae275..0000000 --- a/libzio-1.02.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c3e2bac2461add50c58e68d6c94a7d448658ddee9776c07b97b6c8204dc068b -size 21490 diff --git a/libzio-1.03.tar.bz2 b/libzio-1.03.tar.bz2 new file mode 100644 index 0000000..007d651 --- /dev/null +++ b/libzio-1.03.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b22396567147c8065e9d8f4806836f8a5411a16ff7110054d81e191bf7d89040 +size 22027 diff --git a/libzio.changes b/libzio.changes index 5d891e1..3d0daed 100644 --- a/libzio.changes +++ b/libzio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 27 15:48:10 UTC 2017 - werner@suse.de + +- Use -D_DEFAULT_SOURCE + ------------------------------------------------------------------- Thu Feb 19 21:52:33 UTC 2015 - p.drouand@gmail.com diff --git a/libzio.spec b/libzio.spec index cd734c6..685777c 100644 --- a/libzio.spec +++ b/libzio.spec @@ -1,7 +1,7 @@ # # spec file for package libzio # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libzio %define lname libzio1 -Version: 1.02 +Version: 1.03 Release: 0 Summary: A Library for Accessing Compressed Text Files License: GPL-2.0+ @@ -27,8 +27,8 @@ Url: http://libzio.sourceforge.net/ Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: baselibs.conf BuildRequires: libbz2-devel -BuildRequires: zlib-devel BuildRequires: xz-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From 5411d26947c44d8b71dade5cd4fbdda7bbb671ff8e400349acac612af8bbf7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 28 Feb 2017 09:41:13 +0000 Subject: [PATCH 2/4] Accepting request 460822 from home:AndreasSchwab:f - Include as required by pthread_sigmask OBS-URL: https://build.opensuse.org/request/show/460822 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libzio?expand=0&rev=29 --- libzio.changes | 5 +++++ libzio.spec | 2 ++ pthread-sigmask.patch | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 pthread-sigmask.patch diff --git a/libzio.changes b/libzio.changes index 3d0daed..3a798b2 100644 --- a/libzio.changes +++ b/libzio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 28 09:07:36 UTC 2017 - schwab@linux-m68k.org + +- Include as required by pthread_sigmask + ------------------------------------------------------------------- Mon Feb 27 15:48:10 UTC 2017 - werner@suse.de diff --git a/libzio.spec b/libzio.spec index 685777c..ecb1a7c 100644 --- a/libzio.spec +++ b/libzio.spec @@ -26,6 +26,7 @@ Group: System/Libraries Url: http://libzio.sourceforge.net/ Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: baselibs.conf +Patch: pthread-sigmask.patch BuildRequires: libbz2-devel BuildRequires: xz-devel BuildRequires: zlib-devel @@ -57,6 +58,7 @@ and static library. %prep %setup -q +%patch -p1 %build make %{?_smp_mflags} noweak diff --git a/pthread-sigmask.patch b/pthread-sigmask.patch new file mode 100644 index 0000000..95f1ab8 --- /dev/null +++ b/pthread-sigmask.patch @@ -0,0 +1,13 @@ +Index: libzio-1.03/lzw.h +=================================================================== +--- libzio-1.03.orig/lzw.h ++++ libzio-1.03/lzw.h +@@ -48,7 +48,7 @@ + #include "zioP.h" + + #if defined _REENTRANT || defined _THREAD_SAFE +-# include ++# include + weak_symbol(pthread_sigmask); + #endif + From ef984d8c0ad65f2825912946d40912a4752f5e2f18d8ec50a6135cd7650dffc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 28 Feb 2017 09:53:06 +0000 Subject: [PATCH 3/4] - Add pthread-sigmask.patch to include as required by pthread_sigmask OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libzio?expand=0&rev=30 --- libzio.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libzio.changes b/libzio.changes index 3a798b2..7583738 100644 --- a/libzio.changes +++ b/libzio.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Feb 28 09:07:36 UTC 2017 - schwab@linux-m68k.org -- Include as required by pthread_sigmask +- Add pthread-sigmask.patch to include as required + by pthread_sigmask ------------------------------------------------------------------- Mon Feb 27 15:48:10 UTC 2017 - werner@suse.de From 966c1bf680b075ef2a36275850ef7dff9e323af46d4efbeff475663f0f7d0475 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 28 Feb 2017 10:10:30 +0000 Subject: [PATCH 4/4] Added patch from Andreas in upstream source tree OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libzio?expand=0&rev=31 --- libzio-1.03.tar.bz2 | 3 --- libzio-1.04.tar.bz2 | 3 +++ libzio.changes | 8 ++++++++ libzio.spec | 4 +--- pthread-sigmask.patch | 13 ------------- 5 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 libzio-1.03.tar.bz2 create mode 100644 libzio-1.04.tar.bz2 delete mode 100644 pthread-sigmask.patch diff --git a/libzio-1.03.tar.bz2 b/libzio-1.03.tar.bz2 deleted file mode 100644 index 007d651..0000000 --- a/libzio-1.03.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b22396567147c8065e9d8f4806836f8a5411a16ff7110054d81e191bf7d89040 -size 22027 diff --git a/libzio-1.04.tar.bz2 b/libzio-1.04.tar.bz2 new file mode 100644 index 0000000..b4cb5c2 --- /dev/null +++ b/libzio-1.04.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96231d9b03ce5d32500e675fe7c9797851cf9e54f554b4c1a6517ef7aafe89ab +size 22058 diff --git a/libzio.changes b/libzio.changes index 7583738..be3cd2e 100644 --- a/libzio.changes +++ b/libzio.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 28 10:07:43 UTC 2017 - werner@suse.de + +- Push version to 1.04 + * Add patch from Andreas Schwab to fix problem with missing + declaration of pthread_sigmask(2) +- Delete pthread-sigmask.patch as now upstream + ------------------------------------------------------------------- Tue Feb 28 09:07:36 UTC 2017 - schwab@linux-m68k.org diff --git a/libzio.spec b/libzio.spec index ecb1a7c..b7f06f0 100644 --- a/libzio.spec +++ b/libzio.spec @@ -18,7 +18,7 @@ Name: libzio %define lname libzio1 -Version: 1.03 +Version: 1.04 Release: 0 Summary: A Library for Accessing Compressed Text Files License: GPL-2.0+ @@ -26,7 +26,6 @@ Group: System/Libraries Url: http://libzio.sourceforge.net/ Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -Patch: pthread-sigmask.patch BuildRequires: libbz2-devel BuildRequires: xz-devel BuildRequires: zlib-devel @@ -58,7 +57,6 @@ and static library. %prep %setup -q -%patch -p1 %build make %{?_smp_mflags} noweak diff --git a/pthread-sigmask.patch b/pthread-sigmask.patch deleted file mode 100644 index 95f1ab8..0000000 --- a/pthread-sigmask.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libzio-1.03/lzw.h -=================================================================== ---- libzio-1.03.orig/lzw.h -+++ libzio-1.03/lzw.h -@@ -48,7 +48,7 @@ - #include "zioP.h" - - #if defined _REENTRANT || defined _THREAD_SAFE --# include -+# include - weak_symbol(pthread_sigmask); - #endif -