[packages/zstd] - updated to 1.1.4 - updated noquiet patch - removed obsolete no32,noclean patches

qboosh qboosh at pld-linux.org
Fri Apr 28 19:54:38 CEST 2017 

commit 14b5ee43359df79c36bd0d138578a8d8c86a951a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 28 19:55:01 2017 +0200

    - updated to 1.1.4
    - updated noquiet patch
    - removed obsolete no32,noclean patches

 zstd-no32.patch    | 13 --------
 zstd-noclean.patch | 11 -------
 zstd-noquiet.patch | 97 ++++++++++++++++++++++--------------------------------
 zstd.spec          | 10 ++----
 4 files changed, 43 insertions(+), 88 deletions(-)
---
diff --git a/zstd.spec b/zstd.spec
index 7b1d956..1956bc0 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,16 +1,14 @@
 Summary:	Zstandard - fast lossless compression algorithm
 Summary(pl.UTF-8):	Zstandard - szybki, bezstratny algorytm kompresji
 Name:		zstd
-Version:	1.1.2
+Version:	1.1.4
 Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/facebook/zstd/releases
 Source0:	https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	4c57a080d194bdaac83f2d3251fc7ffc
+# Source0-md5:	16f16d81ce8bed7d52e1e40b9c73677e
 Patch0:		%{name}-noquiet.patch
-Patch1:		%{name}-no32.patch
-Patch2:		%{name}-noclean.patch
 URL:		https://github.com/facebook/zstd
 BuildRequires:	gcc >= 5:3.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,14 +50,12 @@ Statyczna biblioteka Zstd.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} all
+%{__make} -j1 all
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/zstd-no32.patch b/zstd-no32.patch
deleted file mode 100644
index 5ade035..0000000
--- a/zstd-no32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- zstd-1.0.0/Makefile.orig	2016-08-31 18:09:10.000000000 +0200
-+++ zstd-1.0.0/Makefile	2016-09-16 20:33:14.848164855 +0200
-@@ -25,8 +25,8 @@
- 
- all:
- 	$(MAKE) -C $(ZSTDDIR) $@
--	$(MAKE) -C $(PRGDIR) $@ zstd32
--	$(MAKE) -C $(TESTDIR) $@ all32
-+	$(MAKE) -C $(PRGDIR) $@
-+	$(MAKE) -C $(TESTDIR) $@
- 
- zstd:
- 	$(MAKE) -C $(PRGDIR)
diff --git a/zstd-noclean.patch b/zstd-noclean.patch
deleted file mode 100644
index a9d3e44..0000000
--- a/zstd-noclean.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zstd-1.1.2/lib/Makefile.orig	2016-12-26 12:28:15.143603624 +0100
-+++ zstd-1.1.2/lib/Makefile	2016-12-26 12:30:33.816935375 +0100
-@@ -105,7 +105,7 @@
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
--install: libzstd.a libzstd libzstd.pc
-+install: libzstd.a $(LIBZSTD) libzstd.pc
- 	install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
- 	install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
- 	cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
diff --git a/zstd-noquiet.patch b/zstd-noquiet.patch
index c2fc516..a376c42 100644
--- a/zstd-noquiet.patch
+++ b/zstd-noquiet.patch
@@ -1,13 +1,11 @@
---- zstd-1.1.2/lib/Makefile.orig	2016-12-26 12:13:28.026947087 +0100
-+++ zstd-1.1.2/lib/Makefile	2016-12-26 12:27:54.386937195 +0100
-@@ -67,20 +67,20 @@
+--- zstd-1.1.4/lib/Makefile.orig	2017-04-28 18:58:28.327097113 +0200
++++ zstd-1.1.4/lib/Makefile	2017-04-28 19:00:43.553762235 +0200
+@@ -69,19 +69,19 @@
  libzstd.a: ARFLAGS = rcs
- libzstd.a: $(ZSTD_FILES)
+ libzstd.a: $(ZSTD_OBJ)
  	@echo compiling static library
--	@$(CC) $(FLAGS) -c $^
--	@$(AR) $(ARFLAGS) $@ *.o
-+	$(CC) $(FLAGS) -c $^
-+	$(AR) $(ARFLAGS) $@ *.o
+-	@$(AR) $(ARFLAGS) $@ $^
++	$(AR) $(ARFLAGS) $@ $^
  
  $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
  $(LIBZSTD): $(ZSTD_FILES)
@@ -27,18 +25,22 @@
  endif
  
  libzstd : $(LIBZSTD)
-@@ -88,8 +88,8 @@
- lib: libzstd.a libzstd
+@@ -92,10 +92,10 @@
+ lib-release: lib
  
  clean:
--	@$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
--	@$(RM) decompress/*.o
-+	$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
-+	$(RM) decompress/*.o
+-	@$(RM) -r *.dSYM   # Mac OS-X specific
+-	@$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+-	@$(RM) dll/libzstd.dll dll/libzstd.lib
+-	@$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
++	$(RM) -r *.dSYM   # Mac OS-X specific
++	$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
++	$(RM) dll/libzstd.dll dll/libzstd.lib
++	$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
  	@echo Cleaning library completed
  
- #------------------------------------------------------------------------
-@@ -99,35 +99,35 @@
+ #-----------------------------------------------------------------------------
+@@ -127,25 +127,25 @@
  libzstd.pc:
  libzstd.pc: libzstd.pc.in
  	@echo creating pkgconfig
@@ -50,47 +52,28 @@
               $< >$@
  
  install: libzstd.a libzstd libzstd.pc
--	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--	@install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
--	@cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
--	@install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
--	@install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
--	@install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
--	@install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
--	@install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
-+	install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+	install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-+	cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+	install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
-+	install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
-+	install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
-+	install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
-+	install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
+-	@$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
+-	@$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
++	$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/
++	$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
+ 	@echo Installing libraries
+-	@$(INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)
+-	@$(INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
+-	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+-	@ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
++	$(INSTALL_LIB) libzstd.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
++	ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
++	ln -sf libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+ 	@echo Installing includes
+-	@$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
+-	@$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+-	@$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
+-	@$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
++	$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
  	@echo zstd static and shared library installed
  
  uninstall:
--	@$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
--	@$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
--	@$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--	@$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
--	@$(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
--	@$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
--	@$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
--	@$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
--	@$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+	$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
-+	$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-+	$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-+	$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+	$(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
-+	$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+	$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
-+	$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
-+	$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
- 	@echo zstd libraries successfully uninstalled
- 
- endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zstd.git/commitdiff/14b5ee43359df79c36bd0d138578a8d8c86a951a

More information about the pld-cvs-commit mailing list