From 0cf01c37bda8287402ae15775810894bf5c2cfeedbed68d9b7220125dff0705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 27 Mar 2017 14:15:17 +0000 Subject: [PATCH] - Update to v1.1.4 See https://github.com/facebook/zstd/releases for details. - Drop zstd-lib-no-rebuild.patch OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=6 --- zstd-1.1.1.tar.gz | 3 --- zstd-1.1.4.tar.gz | 3 +++ zstd-lib-no-rebuild.patch | 36 ------------------------------------ zstd.changes | 7 +++++++ zstd.spec | 26 +++++++++++--------------- 5 files changed, 21 insertions(+), 54 deletions(-) delete mode 100644 zstd-1.1.1.tar.gz create mode 100644 zstd-1.1.4.tar.gz delete mode 100644 zstd-lib-no-rebuild.patch diff --git a/zstd-1.1.1.tar.gz b/zstd-1.1.1.tar.gz deleted file mode 100644 index 97de037..0000000 --- a/zstd-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a92965a2480fecc6b7bf491106e93cbf69a298b865b6d623755b3a482d77e614 -size 734872 diff --git a/zstd-1.1.4.tar.gz b/zstd-1.1.4.tar.gz new file mode 100644 index 0000000..8c7cd9f --- /dev/null +++ b/zstd-1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aae2b586e359344cb8ecfe6917a407dc7e01b5d7d7388559714de37900fb9fb +size 923381 diff --git a/zstd-lib-no-rebuild.patch b/zstd-lib-no-rebuild.patch deleted file mode 100644 index 40c87db..0000000 --- a/zstd-lib-no-rebuild.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 230e270552e536c6f54774060003e65c5fd47f6b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Mon, 12 Sep 2016 11:35:26 +0100 -Subject: [PATCH] separate build, clean, and installation - -This is used in the rpm package to allow building the libs and programs in the %build stage, -and installation separated in the %install stage ---- - lib/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/Makefile b/lib/Makefile -index 4fb8ed9..a0be682 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -57,9 +57,9 @@ endif - - .PHONY: default all clean install uninstall - --default: clean libzstd -+default: libzstd - --all: clean libzstd -+all: libzstd - - libzstd: $(ZSTD_FILES) - @echo compiling static library -@@ -89,7 +89,7 @@ libzstd.pc: libzstd.pc.in - -e 's|@VERSION@|$(VERSION)|' \ - $< >$@ - --install: libzstd libzstd.pc -+install: libzstd.pc - @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ - @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) - @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) diff --git a/zstd.changes b/zstd.changes index 5aaee15..f9feadc 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 27 14:04:29 UTC 2017 - idonmez@suse.com + +- Update to v1.1.4 + See https://github.com/facebook/zstd/releases for details. +- Drop zstd-lib-no-rebuild.patch + ------------------------------------------------------------------- Wed Dec 7 09:25:33 UTC 2016 - idonmez@suse.com diff --git a/zstd.spec b/zstd.spec index 93effc9..6ec351a 100644 --- a/zstd.spec +++ b/zstd.spec @@ -1,7 +1,7 @@ # # spec file for package zstd # -# Copyright (c) 2016 SUSE LINUX 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 @@ -16,20 +16,16 @@ # -Name: zstd %define major 1 %define libname lib%{name}%{major} -Version: %{major}.1.1 +Name: zstd +Version: %{major}.1.4 Release: 0 Summary: Zstandard compression tools License: BSD-3-Clause and MIT Group: Productivity/Archiving/Compression Url: https://github.com/facebook/zstd Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz - -# PATCH-FIX-UPSTREAM -- https://github.com/pixelb/zstd/pull/1 -Patch0: zstd-lib-no-rebuild.patch - BuildRequires: gcc BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,11 +62,9 @@ targeting real-time compression scenarios at zlib-level compression ratio. Needed for compiling programs that link with the library. - %prep %setup -q find -name .gitignore -delete -%patch0 -p1 %build for dir in lib programs; do @@ -87,12 +81,14 @@ rm %{buildroot}/%{_libdir}/libzstd.a %files %defattr(-,root,root,-) %doc NEWS README.md -%{_bindir}/%{name} -%{_bindir}/un%{name} -%{_bindir}/%{name}cat -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/un%{name}.1* -%{_mandir}/man1/%{name}cat.1* +%{_bindir}/zstd +%{_bindir}/zstdcat +%{_bindir}/zstdgrep +%{_bindir}/zstdless +%{_bindir}/unzstd +%{_mandir}/man1/zstd.1* +%{_mandir}/man1/unzstd.1* +%{_mandir}/man1/zstdcat.1* %doc LICENSE PATENTS %files -n %{libname}