Update to 3.1.0
This commit is contained in:
		
							parent
							
								
									bab8efc370
								
							
						
					
					
						commit
						ba30a4fd5a
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -21,3 +21,4 @@ | ||||
| /python-pillow-Pillow-2.8.2-0-g0222a05.tar.gz | ||||
| /python-pillow-Pillow-2.9.0-0-g80672b6.tar.gz | ||||
| /python-pillow-Pillow-3.0.0-0-g0177cce.tar.gz | ||||
| /python-pillow-Pillow-3.1.0-0-gfff5536.tar.gz | ||||
|  | ||||
							
								
								
									
										22
									
								
								255a8b522022bfedf3d257fa4b3ff7259642cd01.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								255a8b522022bfedf3d257fa4b3ff7259642cd01.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,22 @@ | ||||
| From 255a8b522022bfedf3d257fa4b3ff7259642cd01 Mon Sep 17 00:00:00 2001 | ||||
| From: Sandro Mani <manisandro@gmail.com> | ||||
| Date: Mon, 4 Jan 2016 13:44:24 +0100 | ||||
| Subject: [PATCH] Fix incorrect conditional | ||||
| 
 | ||||
| ---
 | ||||
|  encode.c | 2 +- | ||||
|  1 file changed, 1 insertion(+), 1 deletion(-) | ||||
| 
 | ||||
| diff --git a/encode.c b/encode.c
 | ||||
| index fef1021..63220b7 100644
 | ||||
| --- a/encode.c
 | ||||
| +++ b/encode.c
 | ||||
| @@ -54,7 +54,7 @@ PyImaging_EncoderNew(int contextsize)
 | ||||
|      ImagingEncoderObject *encoder; | ||||
|      void *context; | ||||
|   | ||||
| -    if(!PyType_Ready(&ImagingEncoderType) < 0)
 | ||||
| +    if(PyType_Ready(&ImagingEncoderType) < 0)
 | ||||
|          return NULL; | ||||
|   | ||||
|      encoder = PyObject_New(ImagingEncoderObject, &ImagingEncoderType); | ||||
| @ -17,7 +17,7 @@ | ||||
| 
 | ||||
| # Refer to the comment for Source0 below on how to obtain the source tarball | ||||
| # The saved file has format python-pillow-Pillow-$version-$ahead-g$shortcommit.tar.gz | ||||
| %global commit 0177cceac4adfd0020ecbf49fb44ad275dcc1f51 | ||||
| %global commit fff5536b37c2d619c66c1189b6925fa0a8df3822 | ||||
| %global shortcommit %(c=%{commit}; echo ${c:0:7}) | ||||
| %global ahead 0 | ||||
| 
 | ||||
| @ -27,8 +27,8 @@ | ||||
| %endif | ||||
| 
 | ||||
| Name:           python-pillow | ||||
| Version:        3.0.0 | ||||
| Release:        5%{?snap}%{?dist} | ||||
| Version:        3.1.0 | ||||
| Release:        1%{?snap}%{?dist} | ||||
| Summary:        Python image processing library | ||||
| 
 | ||||
| # License: see http://www.pythonware.com/products/pil/license.htm | ||||
| @ -39,6 +39,9 @@ URL:            http://python-pillow.github.io/ | ||||
| #  wget --content-disposition https://github.com/python-pillow/Pillow/tarball/$commit | ||||
| Source0:        https://github.com/python-pillow/Pillow/tarball/%{commit}/python-pillow-Pillow-%{version}-%{ahead}-g%{shortcommit}.tar.gz | ||||
| 
 | ||||
| # Backport upstream commit to fix incorrect conditional | ||||
| Patch0:         255a8b522022bfedf3d257fa4b3ff7259642cd01.patch | ||||
| 
 | ||||
| BuildRequires:  tk-devel | ||||
| BuildRequires:  libjpeg-devel | ||||
| BuildRequires:  zlib-devel | ||||
| @ -189,6 +192,7 @@ PIL image wrapper for Qt. | ||||
| 
 | ||||
| %prep | ||||
| %setup -q -n python-pillow-Pillow-%{shortcommit} | ||||
| %patch0 -p1 | ||||
| 
 | ||||
| # Strip shebang on non-executable file | ||||
| sed -i 1d PIL/OleFileIO.py | ||||
| @ -342,6 +346,9 @@ popd | ||||
| %endif | ||||
| 
 | ||||
| %changelog | ||||
| * Mon Jan 04 2016 Sandro Mani <manisandro@gmail.com> - 3.1.0-1 | ||||
| - Update to 3.1.0 | ||||
| 
 | ||||
| * Tue Dec 29 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.0.0-5 | ||||
| - Build with docs | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user