From 65ec057fe6a1cecfdbabbf4bee1363708a960441785d32177fe1bed3a6df8b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 30 Jan 2012 12:58:59 +0000 Subject: [PATCH 1/3] Accepting request 102052 from home:jengelh:branches:shlib - Remove redundant/unwanted tags/section (cf. specfile guidelines) - Use %_smp_mflags for parallel building - Do shlib policy packaging OBS-URL: https://build.opensuse.org/request/show/102052 OBS-URL: https://build.opensuse.org/package/show/graphics/libmng?expand=0&rev=7 --- baselibs.conf | 2 +- libmng.changes | 7 +++++++ libmng.spec | 33 ++++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index b7ee9b8..23efa16 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libmng +libmng1 diff --git a/libmng.changes b/libmng.changes index ba0aa14..f1233e1 100644 --- a/libmng.changes +++ b/libmng.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 21 17:59:42 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Do shlib policy packaging + ------------------------------------------------------------------- Sat Feb 13 08:25:24 UTC 2010 - adrian@suse.de diff --git a/libmng.spec b/libmng.spec index 282ce0d..fdeafdd 100644 --- a/libmng.spec +++ b/libmng.spec @@ -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) 2011 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,13 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libmng +%define lname libmng1 BuildRequires: libjpeg-devel liblcms-devel zlib-devel License: GPLv2+ ; Other uncritical OpenSource License -Group: System/Libraries +Group: Development/Libraries/C and C++ Summary: Library for Support of MNG and JNG Formats Version: 1.0.10 Release: 93 @@ -30,7 +30,7 @@ Release: 93 Obsoletes: libmng-64bit %endif # -Url: http://www.libmng.com/ +URL: http://www.libmng.com/ Source0: libmng-%version.tar.bz2 Source1: baselibs.conf Patch: libmng.diff @@ -48,9 +48,20 @@ Authors: -------- Gerard Juyn +%package -n %lname +Summary: Library for Support of MNG and JNG Formats +Group: System/Libraries +# O/P added 2011-11-29 +Obsolets: libmng < %version-%release +Provides: libmng = %version-%release + +%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 +Requires: libjpeg-devel liblcms-devel zlib-devel +Requires: %lname = %version Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ # bug437293 @@ -77,7 +88,7 @@ Authors: %patch3 %build -make %{?jobs:-j%jobs} -f makefiles/makefile.linux _LIB=%_lib +make %{?_smp_mflags} -f makefiles/makefile.linux _LIB=%_lib %install make -f makefiles/makefile.linux DESTDIR=$RPM_BUILD_ROOT _LIB=%_lib install @@ -93,11 +104,11 @@ 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 -%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.* From 994583fb9a9d4c4c04be01662c10dd36c8a7f4887ecaf4afa90c377e87974c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 31 Jan 2012 10:48:34 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/graphics/libmng?expand=0&rev=8 --- libmng.spec | 75 +++++++++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/libmng.spec b/libmng.spec index fdeafdd..91306c7 100644 --- a/libmng.spec +++ b/libmng.spec @@ -1,7 +1,7 @@ # # spec file for package libmng # -# Copyright (c) 2011 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 @@ -16,24 +16,25 @@ # - Name: libmng -%define lname libmng1 -BuildRequires: libjpeg-devel liblcms-devel zlib-devel -License: GPLv2+ ; Other uncritical OpenSource License -Group: Development/Libraries/C and C++ -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 +Url: http://www.libmng.com/ +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,28 +43,24 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This library can handle MNG and JNG formats that contain animated pictures. These formats should replace the GIF format. - - -Authors: --------- - Gerard Juyn - %package -n %lname Summary: Library for Support of MNG and JNG Formats Group: System/Libraries # O/P added 2011-11-29 -Obsolets: libmng < %version-%release -Provides: libmng = %version-%release +Obsoletes: libmng < %{version}-%{release} +Provides: libmng = %{version}-%{release} %description -n %lname This library can handle MNG and JNG formats that contain animated pictures. These formats should replace the GIF format. %package devel -Requires: libjpeg-devel liblcms-devel zlib-devel -Requires: %lname = %version -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 @@ -76,33 +73,27 @@ pictures. These formats should replace the GIF format. This package contains the static library and the header files. - - -Authors: --------- - Gerard Juyn - %prep %setup -q -%patch +%patch1 %patch3 %build -make %{?_smp_mflags} -f makefiles/makefile.linux _LIB=%_lib +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 -n %lname -p /sbin/ldconfig @@ -115,9 +106,9 @@ install -m 0755 libmng.a $RPM_BUILD_ROOT/%_libdir/libmng-mini.a %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 From 0b8614cc965f98e6eb8442d7aa16d644fb563b120387e1964c4b7a6846fcabb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 1 Feb 2012 11:18:57 +0000 Subject: [PATCH 3/3] - Remove contrib directory during build, its unused and might confuse licensing, bnc#744320 OBS-URL: https://build.opensuse.org/package/show/graphics/libmng?expand=0&rev=9 --- libmng.changes | 6 ++++++ libmng.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libmng.changes b/libmng.changes index f1233e1..7dc4283 100644 --- a/libmng.changes +++ b/libmng.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 1 11:19:24 UTC 2012 - idonmez@suse.com + +- Remove contrib directory during build, its unused and might + confuse licensing, bnc#744320 + ------------------------------------------------------------------- Mon Nov 21 17:59:42 UTC 2011 - jengelh@medozas.de diff --git a/libmng.spec b/libmng.spec index 91306c7..3d73144 100644 --- a/libmng.spec +++ b/libmng.spec @@ -79,6 +79,10 @@ This package contains the static library and the header files. %patch3 %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} %install