From 2c0d4fdaaad82d2dc9010b38c7f7bbcebf8bfe8cd0017a48025f4f188b9a9945 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Apr 2022 13:31:24 +0000 Subject: [PATCH] Accepting request 973186 from home:jengelh:branches:multimedia:libs - Move documentation to where it's used: with the -devel subpackage. - Update descriptions, RPM groups - Trim --with-pic (only has effects for static libs) - Repair a bit more of libopenraw1->9 OBS-URL: https://build.opensuse.org/request/show/973186 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libopenraw?expand=0&rev=37 --- baselibs.conf | 3 ++- libopenraw.changes | 8 ++++++++ libopenraw.spec | 21 +++++++++------------ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 9819d38..2eeb12e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,7 @@ libopenraw9 + conflicts "libopenraw1" gdk-pixbuf-loader-libopenraw requires "gdk-pixbuf-query-loaders-" - supplements "packageand(libopenraw1-:gdk-pixbuf-)" + supplements "packageand(libopenraw9-:gdk-pixbuf-)" post "%gdk_pixbuf_loader_post" postun "%gdk_pixbuf_loader_postun" diff --git a/libopenraw.changes b/libopenraw.changes index 0b17908..fbd46db 100644 --- a/libopenraw.changes +++ b/libopenraw.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 27 12:41:15 UTC 2022 - Jan Engelhardt + +- Move documentation to where it's used: with the -devel subpackage. +- Update descriptions, RPM groups +- Trim --with-pic (only has effects for static libs) +- Repair a bit more of libopenraw1->9 + ------------------------------------------------------------------- Mon Apr 25 14:48:28 UTC 2022 - Dominique Leuenberger diff --git a/libopenraw.spec b/libopenraw.spec index 6b57a16..051a0d8 100644 --- a/libopenraw.spec +++ b/libopenraw.spec @@ -50,7 +50,7 @@ libopenraw is a library that aim at decoding digital camera RAW files. %package -n libopenraw9 Summary: A library to decode digital camera RAW files -Group: Development/Libraries/C and C++ +Group: System/Libraries # libopenraw.so.0, version 0.3.1, was wrongly packaged in libopenraw1 Conflicts: libopenraw1 >= 0.3 @@ -58,8 +58,8 @@ Conflicts: libopenraw1 >= 0.3 libopenraw is a library that aim at decoding digital camera RAW files. %package -n gdk-pixbuf-loader-libopenraw -Summary: A library to decode digital camera RAW files -- gdk-pixbuf loader -Group: Development/Libraries/C and C++ +Summary: gdk-pixbuf loader for libopenraw +Group: System/Libraries Supplements: packageand(libopenraw9:gdk-pixbuf) %{gdk_pixbuf_loader_requires} @@ -73,14 +73,13 @@ Summary: A library to decode digital camera RAW files Group: Development/Libraries/C and C++ #include gdk-pixbuf/gdk-pixbuf.h Requires: gdk-pixbuf-devel -Requires: libopenraw9 = %{version} +Requires: libopenraw9 = %{version}-%{release} %description -n libopenraw-devel libopenraw is a library that aim at decoding digital camera RAW files. %prep -%setup -q -%setup -q -T -D -a3 +%autosetup -a3 mv vendor lib/mp4/ cd lib/mp4 sed -i 's/byteorder = "1.2.1"/byteorder = "1.2.2"/' mp4parse/Cargo.toml @@ -94,17 +93,15 @@ directory = "vendor" EOF %build -%configure \ - --disable-static \ - --with-pic -make V=1 %{?_smp_mflags} +%configure --disable-static +%make_build %install %make_install find %{buildroot} -type f -name "*.la" -delete -print %check -make %{?_smp_mflags} check +%make_build check %post -n libopenraw9 -p /sbin/ldconfig %postun -n libopenraw9 -p /sbin/ldconfig @@ -117,13 +114,13 @@ make %{?_smp_mflags} check %files -n libopenraw9 %license COPYING -%doc README TODO ChangeLog %{_libdir}/*.so.* %files -n gdk-pixbuf-loader-libopenraw %{_libdir}/gdk-pixbuf-2.0/*/loaders/libopenraw_pixbuf.so %files -n libopenraw-devel +%doc README TODO ChangeLog %{_libdir}/*.so %dir %{_includedir}/libopenraw-0.3 %{_includedir}/libopenraw-0.3/*