From edae643312499cab2f65a4490e2d6f6a1250e78988bccb6f07830309f9313bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 28 Apr 2015 09:28:29 +0000 Subject: [PATCH] Accepting request 304191 from home:pluskalm:branches:graphics - Update to 2.0.3 * More changes to libmng_types.h. - Cleanup spec file with spec-cleaner - Remove old obsolete/provide - Use %cmake macro when building - Remove no longer needed fix-header-include.patch OBS-URL: https://build.opensuse.org/request/show/304191 OBS-URL: https://build.opensuse.org/package/show/graphics/libmng?expand=0&rev=19 --- fix-header-include.patch | 10 ----- libmng-1.0.9-dont-leak-zlib-streams.diff | 9 ++-- libmng-2.0.2.tar.xz | 3 -- libmng-2.0.3.tar.xz | 3 ++ libmng.changes | 10 +++++ libmng.spec | 55 ++++++++---------------- 6 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 fix-header-include.patch delete mode 100644 libmng-2.0.2.tar.xz create mode 100644 libmng-2.0.3.tar.xz diff --git a/fix-header-include.patch b/fix-header-include.patch deleted file mode 100644 index be45a08..0000000 --- a/fix-header-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libmng-2.0.2.orig/libmng_types.h 2013-01-20 04:45:24.000000000 +0100 -+++ libmng-2.0.2/libmng_types.h 2014-05-20 19:10:09.460790466 +0200 -@@ -204,6 +204,7 @@ - #define HAVE_BOOLEAN - typedef int boolean; - #endif -+#include - #include - #endif /* MNG_INCLUDE_IJG6B */ - diff --git a/libmng-1.0.9-dont-leak-zlib-streams.diff b/libmng-1.0.9-dont-leak-zlib-streams.diff index 0c01995..2eb66f6 100644 --- a/libmng-1.0.9-dont-leak-zlib-streams.diff +++ b/libmng-1.0.9-dont-leak-zlib-streams.diff @@ -1,7 +1,8 @@ -diff -ur libmng-orig/libmng_zlib.c libmng-1.0.10/libmng_zlib.c ---- libmng_zlib.c 2005-12-15 00:53:13.000000000 +0100 -+++ libmng_zlib.c 2007-07-19 13:17:44.000000000 +0200 -@@ -162,6 +162,9 @@ +Index: libmng_zlib.c +=================================================================== +--- libmng_zlib.c.orig ++++ libmng_zlib.c +@@ -163,6 +163,9 @@ mng_retcode mngzlib_inflateinit (mng_dat #ifdef MNG_SUPPORT_TRACE MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEINIT, MNG_LC_START); #endif diff --git a/libmng-2.0.2.tar.xz b/libmng-2.0.2.tar.xz deleted file mode 100644 index e996c8e..0000000 --- a/libmng-2.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:278c04c781e5a679c91df006fee7e71233e6f15557aef513a19fe49cd650bc50 -size 951844 diff --git a/libmng-2.0.3.tar.xz b/libmng-2.0.3.tar.xz new file mode 100644 index 0000000..8ee85e0 --- /dev/null +++ b/libmng-2.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3 +size 951808 diff --git a/libmng.changes b/libmng.changes index 66fa847..53734d9 100644 --- a/libmng.changes +++ b/libmng.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 27 13:52:20 UTC 2015 - mpluskal@suse.com + +- Update to 2.0.3 + * More changes to libmng_types.h. +- Cleanup spec file with spec-cleaner +- Remove old obsolete/provide +- Use %cmake macro when building +- Remove no longer needed fix-header-include.patch + ------------------------------------------------------------------- Tue Jun 17 01:45:04 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libmng.spec b/libmng.spec index fe949ac..41c6bf9 100644 --- a/libmng.spec +++ b/libmng.spec @@ -1,7 +1,7 @@ # # spec file for package libmng # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,59 +16,44 @@ # +%define lname libmng2 Name: libmng -Version: 2.0.2 +Version: 2.0.3 Release: 0 Summary: Library for Support of MNG and JNG Formats License: Zlib Group: Development/Libraries/C and C++ -%define lname libmng2 +Url: http://www.libmng.com/ +Source0: http://downloads.sourceforge.net/project/%{name}/%{name}-devel/%{version}/%{name}-%{version}.tar.xz +Source1: baselibs.conf +Patch0: libmng-1.0.9-dont-leak-zlib-streams.diff BuildRequires: cmake BuildRequires: libjpeg-devel BuildRequires: liblcms2-devel BuildRequires: man BuildRequires: pkg-config BuildRequires: zlib-devel -# bug437293 -%ifarch ppc64 -Obsoletes: libmng-64bit -%endif -# -Url: http://www.libmng.com/ -Source0: http://downloads.sourceforge.net/project/%{name}/%{name}-devel/%{version}/%{name}-%{version}.tar.xz -Source1: baselibs.conf -Patch0: libmng-1.0.9-dont-leak-zlib-streams.diff -# PATCH-FIX-UPSTREAM fix-header-include.patch -- make libmng_types header usable to outside packages/libraries -Patch1: fix-header-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library can handle MNG and JNG formats that contain animated pictures. These formats should replace the GIF format. -%package -n %lname +%package -n %{lname} Summary: Library for Support of MNG and JNG Formats Group: System/Libraries -# O/P added 2011-11-29 -Obsoletes: libmng < %{version}-%{release} -Provides: libmng = %{version}-%{release} -%description -n %lname +%description -n %{lname} This library can handle MNG and JNG formats that contain animated pictures. These formats should replace the GIF format. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: %lname = %{version} +Requires: %{lname} = %{version} Requires: libjpeg-devel Requires: liblcms2-devel Requires: zlib-devel -# bug437293 -%ifarch ppc64 -Obsoletes: libmng-devel-64bit -%endif -# %description devel This library can handle MNG and JNG formats which contain animated @@ -79,33 +64,27 @@ This package contains the static library and the header files. %prep %setup -q %patch0 -%patch1 -p1 %build # This is not zlib licensed and unused, just as a caution, bnc#744320 rm -rf contrib -export CXXFLAGS="%{optflags}" -export CFLAGS="$CXXFLAGS" -mkdir build && cd build && \ -cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%cmake \ -DCMAKE_SKIP_RPATH=ON \ - -DMNG_INSTALL_DOC_DIR=%{_datadir}/doc/packages/%{name} \ + -DMNG_INSTALL_DOC_DIR=%{_docdir}/%{name} \ -DBUILD_MAN=ON \ -DBUILD_STATIC_LIBS=OFF .. make %{?_smp_mflags} %install -%make_install -C build +%cmake_install -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%files -n %lname +%files -n %{lname} %defattr(-,root,root) %doc LICENSE README doc/doc.readme doc/libmng.txt %{_libdir}/libmng.so.* @@ -113,7 +92,7 @@ make %{?_smp_mflags} %files devel %defattr(-,root,root) %{_includedir}/*.h -%doc %{_mandir}/*/* +%{_mandir}/*/* %doc %{_docdir}/libmng/ %{_libdir}/pkgconfig/libmng.pc %{_libdir}/libmng.so