diff --git a/libicns-0.7.1-libpng15.patch b/libicns-0.7.1-libpng15.patch deleted file mode 100644 index 267e703..0000000 --- a/libicns-0.7.1-libpng15.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -durN libicns-0.7.1.orig/icnsutils/png2icns.c libicns-0.7.1/icnsutils/png2icns.c ---- libicns-0.7.1.orig/icnsutils/png2icns.c 2009-05-11 08:17:16.000000000 +0200 -+++ libicns-0.7.1/icnsutils/png2icns.c 2011-12-09 12:32:22.191980969 +0100 -@@ -31,6 +31,10 @@ - #define FALSE 0 - #define TRUE 1 - -+#if PNG_LIBPNG_VER > 10400 -+#define PNG2ICNS_EXPAND_GRAY 1 -+#endif -+ - static int read_png(FILE *fp, png_bytepp buffer, int32_t *bpp, int32_t *width, int32_t *height) - { - png_structp png_ptr; -@@ -70,7 +74,11 @@ - switch (color_type) - { - case PNG_COLOR_TYPE_GRAY: -+ #ifdef PNG2ICNS_EXPAND_GRAY -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+ #else - png_set_gray_1_2_4_to_8(png_ptr); -+ #endif - - if (bit_depth == 16) { - png_set_strip_16(png_ptr); -@@ -82,7 +90,11 @@ - break; - - case PNG_COLOR_TYPE_GRAY_ALPHA: -+ #ifdef PNG2ICNS_EXPAND_GRAY -+ png_set_expand_gray_1_2_4_to_8(png_ptr); -+ #else - png_set_gray_1_2_4_to_8(png_ptr); -+ #endif - - if (bit_depth == 16) { - png_set_strip_16(png_ptr); diff --git a/libicns.spec b/libicns.spec index 1e8da87..2fb2053 100644 --- a/libicns.spec +++ b/libicns.spec @@ -1,6 +1,6 @@ Name: libicns -Version: 0.7.1 -Release: 5%{?dist} +Version: 0.8.0 +Release: 1%{?dist} Summary: Library for manipulating Macintosh icns files Group: System Environment/Libraries @@ -9,9 +9,6 @@ Group: System Environment/Libraries License: LGPLv2+ and GPLv2+ URL: http://icns.sourceforge.net/ Source0: http://downloads.sourceforge.net/icns/%{name}-%{version}.tar.gz -# Fix build with libpng 1.5 -# http://sourceforge.net/tracker/?func=detail&aid=2991016&group_id=174339&atid=868841 -Patch0: %{name}-0.7.1-libpng15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel @@ -46,7 +43,6 @@ icontainer2icns - extract icns files from icontainers %prep %setup -q -%patch0 -p1 %build @@ -92,10 +88,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 04 2012 Andrea Musuruane - 0.8.0-1 +- Updated to new upstream 0.8.0 + * Fri Jan 13 2012 Fedora Release Engineering - 0.7.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Fri Dec 09 2011 ndrea Musuruane - 0.7.1-4 +* Fri Dec 09 2011 Andrea Musuruane - 0.7.1-4 - Fixed FTBFS for new libpng * Tue Dec 06 2011 Adam Jackson - 0.7.1-3