Accepting request 304327 from graphics

1

OBS-URL: https://build.opensuse.org/request/show/304327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmng?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2015-04-30 09:50:04 +00:00 committed by Git OBS Bridge
commit caf482e457
6 changed files with 35 additions and 55 deletions

View File

@ -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 <stdio.h>
#include <jpeglib.h>
#endif /* MNG_INCLUDE_IJG6B */

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:278c04c781e5a679c91df006fee7e71233e6f15557aef513a19fe49cd650bc50
size 951844

BIN
libmng-2.0.3.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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

View File

@ -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