Hello community, here is the log from the commit of package libmng for openSUSE:Factory checked in at 2014-06-02 07:04:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmng (Old) and /work/SRC/openSUSE:Factory/.libmng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmng" Changes: -------- --- /work/SRC/openSUSE:Factory/libmng/libmng.changes 2013-04-17 07:16:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmng.new/libmng.changes 2014-06-02 07:04:16.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 20 17:12:33 UTC 2014 - [email protected] + +- Added fix-header-include.patch; make libmng_types header usable + to outside packages/libraries + +------------------------------------------------------------------- +Sat May 17 21:56:29 UTC 2014 - [email protected] + +- Update to 2.0.2 + * Added support for lcms2. + * Added support for libjpeg version 9. +- Bump %lname to libmng2, per upstream change (also adjusted baselibs) +- Switch to CMake buildsystem: added cmake BuildRequires +- Added pkg-config and man BuildRequires +- BuildRequire liblcms2-devel instead of liblcms-devel +- Drop libmng-no-jpeg.diff and libmng.diff, not needed with good, CMake + buildsystem + +------------------------------------------------------------------- Old: ---- libmng-1.0.10.tar.bz2 libmng-no-jpeg.diff libmng.diff New: ---- fix-header-include.patch libmng-2.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmng.spec ++++++ --- /var/tmp/diff_new_pack.B0inXK/_old 2014-06-02 07:04:17.000000000 +0200 +++ /var/tmp/diff_new_pack.B0inXK/_new 2014-06-02 07:04:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libmng # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,17 @@ Name: libmng -Version: 1.0.10 +Version: 2.0.2 Release: 0 Summary: Library for Support of MNG and JNG Formats License: Zlib Group: Development/Libraries/C and C++ -%define lname libmng1 +%define lname libmng2 +BuildRequires: cmake BuildRequires: libjpeg-devel -BuildRequires: liblcms-devel +BuildRequires: liblcms2-devel +BuildRequires: man +BuildRequires: pkg-config BuildRequires: zlib-devel # bug437293 %ifarch ppc64 @@ -32,11 +35,11 @@ %endif # Url: http://www.libmng.com/ -Source0: http://downloads.sourceforge.net/project/%{name}/%{name}-devel/%{version}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/project/%{name}/%{name}-devel/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf -Patch1: libmng.diff -Patch2: libmng-no-jpeg.diff -Patch3: libmng-1.0.9-dont-leak-zlib-streams.diff +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 @@ -75,29 +78,28 @@ %prep %setup -q -%patch1 -%patch3 +%patch0 +%patch1 -p1 %build - # This is not zlib licensed and unused, just as a caution, bnc#744320 rm -rf contrib -make %{?_smp_mflags} -f makefiles/makefile.linux _LIB=%{_lib} +export CXXFLAGS="%{optflags}" +export CFLAGS="$CXXFLAGS" +mkdir build && cd build && \ +cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_SKIP_RPATH=ON \ + -DMNG_INSTALL_DOC_DIR=%{_datadir}/doc/packages/%{name} \ + -DBUILD_MAN=ON \ + -DBUILD_STATIC_LIBS=OFF .. + +make %{?_smp_mflags} %install -make -f makefiles/makefile.linux DESTDIR=%{buildroot} _LIB=%{_lib} install -mkdir -p %{buildroot}/%{_mandir}/man3/ %{buildroot}/%{_mandir}/man5/ -install -m 0644 doc/man/*.3 %{buildroot}/%{_mandir}/man3/ -install -m 0644 doc/man/*.5 %{buildroot}/%{_mandir}/man5/ -# -# build a mini libmng -# -make -f makefiles/makefile.linux clean -patch -p0 < %{PATCH2} -make -f makefiles/makefile.linux _LIB=%{_lib} -install -m 0644 libmng.a %{buildroot}/%{_libdir}/libmng-mini.a -rm -v %{buildroot}%{_libdir}/libmng.a +%make_install -C build %post -n %lname -p /sbin/ldconfig @@ -112,7 +114,9 @@ %defattr(-,root,root) %{_includedir}/*.h %doc %{_mandir}/*/* -%{_libdir}/libmng-mini.a +%doc %{_docdir}/libmng/ +%{_libdir}/pkgconfig/libmng.pc %{_libdir}/libmng.so +%{_datadir}/mng-2.0/ %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.B0inXK/_old 2014-06-02 07:04:17.000000000 +0200 +++ /var/tmp/diff_new_pack.B0inXK/_new 2014-06-02 07:04:17.000000000 +0200 @@ -1 +1 @@ -libmng1 +libmng2 ++++++ fix-header-include.patch ++++++ --- 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 */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
