Hello community, here is the log from the commit of package libmng for openSUSE:Factory checked in at 2012-02-03 10:23:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmng (Old) and /work/SRC/openSUSE:Factory/.libmng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmng", Maintainer is "nadvor...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmng/libmng.changes 2011-09-23 02:08:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmng.new/libmng.changes 2012-02-03 10:23:41.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 1 11:19:24 UTC 2012 - idon...@suse.com + +- Remove contrib directory during build, its unused and might + confuse licensing, bnc#744320 + +------------------------------------------------------------------- +Mon Nov 21 17:59:42 UTC 2011 - jeng...@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Do shlib policy packaging + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmng.spec ++++++ --- /var/tmp/diff_new_pack.7nWUzs/_old 2012-02-03 10:23:42.000000000 +0100 +++ /var/tmp/diff_new_pack.7nWUzs/_new 2012-02-03 10:23:42.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libmng (Version 1.0.10) +# spec file for package libmng # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,25 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libmng -BuildRequires: libjpeg-devel liblcms-devel zlib-devel -License: GPLv2+ ; Other uncritical OpenSource License -Group: System/Libraries -Summary: Library for Support of MNG and JNG Formats Version: 1.0.10 -Release: 93 +Release: 0 +Summary: Library for Support of MNG and JNG Formats +License: Zlib +Group: Development/Libraries/C and C++ +%define lname libmng1 +BuildRequires: libjpeg-devel +BuildRequires: liblcms-devel +BuildRequires: zlib-devel # bug437293 %ifarch ppc64 Obsoletes: libmng-64bit %endif # Url: http://www.libmng.com/ -Source0: libmng-%version.tar.bz2 +Source0: libmng-%{version}.tar.bz2 Source1: baselibs.conf -Patch: libmng.diff +Patch1: libmng.diff Patch2: libmng-no-jpeg.diff Patch3: libmng-1.0.9-dont-leak-zlib-streams.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,17 +43,24 @@ This library can handle MNG and JNG formats that contain animated pictures. These formats should replace the GIF format. +%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} - -Authors: --------- - Gerard Juyn <ger...@libmng.com> +%description -n %lname +This library can handle MNG and JNG formats that contain animated +pictures. These formats should replace the GIF format. %package devel -License: GPLv2+ ; Other uncritical OpenSource License -Requires: libjpeg-devel %{name} = %{version} liblcms-devel zlib-devel -Summary: Include Files and Libraries mandatory for Development. +Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ +Requires: %lname = %{version} +Requires: libjpeg-devel +Requires: liblcms-devel +Requires: zlib-devel # bug437293 %ifarch ppc64 Obsoletes: libmng-devel-64bit @@ -65,48 +73,46 @@ This package contains the static library and the header files. - - -Authors: --------- - Gerard Juyn <ger...@libmng.com> - %prep %setup -q -%patch +%patch1 %patch3 %build -make %{?jobs:-j%jobs} -f makefiles/makefile.linux _LIB=%_lib + +# 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} %install -make -f makefiles/makefile.linux DESTDIR=$RPM_BUILD_ROOT _LIB=%_lib install -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3/ $RPM_BUILD_ROOT/%{_mandir}/man5/ -install -m 0644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3/ -install -m 0644 doc/man/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/ +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 0755 libmng.a $RPM_BUILD_ROOT/%_libdir/libmng-mini.a -%{__rm} -v %{buildroot}%_libdir/libmng.a +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 -%post -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files +%files -n %lname %defattr(-,root,root) %doc LICENSE README doc/doc.readme doc/libmng.txt %{_libdir}/libmng.so.* %files devel %defattr(-,root,root) -/usr/include/*.h -%doc %_mandir/*/* -%_libdir/libmng-mini.a -%_libdir/libmng.so +%{_includedir}/*.h +%doc %{_mandir}/*/* +%{_libdir}/libmng-mini.a +%{_libdir}/libmng.so %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.7nWUzs/_old 2012-02-03 10:23:42.000000000 +0100 +++ /var/tmp/diff_new_pack.7nWUzs/_new 2012-02-03 10:23:42.000000000 +0100 @@ -1 +1 @@ -libmng +libmng1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
