From a75245f1b6e8aaf8e53c6188ee233d542a3425fd5f8bf6f93f7d5b088b67a4a7 Mon Sep 17 00:00:00 2001 From: Brian White Date: Tue, 10 Apr 2012 18:24:49 +0000 Subject: [PATCH] Accepting request 113133 from home:aljex:branches:graphics Fix shlib names to conform to http://en.opensuse.org/openSUSE:Shared_library_packaging_policy OBS-URL: https://build.opensuse.org/request/show/113133 OBS-URL: https://build.opensuse.org/package/show/graphics/jbigkit?expand=0&rev=3 --- jbigkit.changes | 44 ++------------------------------------------ jbigkit.spec | 46 +++++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 59 deletions(-) diff --git a/jbigkit.changes b/jbigkit.changes index f8d66ef..00ecc7f 100644 --- a/jbigkit.changes +++ b/jbigkit.changes @@ -1,45 +1,5 @@ ------------------------------------------------------------------- -Fri Apr 6 18:06:11 UTC 2012 - brian@aljex.com +Tue Apr 10 17:00:40 UTC 2012 - brian@aljex.com -- Clean up spec license comment and license header for Factory -- remove unnecessary buildrequires +- Initial SUSE package. -------------------------------------------------------------------- -Fri Apr 6 06:25:39 UTC 2012 - brian@aljex.com - -- rpmlint: move *.so to -devel -- rpmlint: move/include/remove doc files in main and lib packages - - -------------------------------------------------------------------- -Fri Apr 6 06:08:17 UTC 2012 - brian@aljex.com - -- renamed buildservice package name from jbig-kit to jbigkit to match rpm package name and source tar/directory to satisfy Factory -- renamed jbigkit-libs package to libjbig -- renamed jbigkit-devel to libjbig-devel - -* Thu Apr 05 2012 Brian K. White -- remove .so's from -devel package -- remove never-intended junk from /usr/bin -- fix rpm "Group:" headers (copy tiff/lib/devel) - -* Sun Jan 03 2010 Brian K. White -- copied from FC11 for openSUSE (11.2) to get .so's - -* Sun Mar 29 2009 Thorsten Leemhuis - 2.0-3 -- rebuild for new F11 features - -* Fri Sep 05 2008 David Woodhouse 2.0-2 -- Add missing jbig_ar.h - -* Wed Sep 03 2008 David Woodhouse 2.0-1 -- Update to 2.0 - -* Sun Aug 03 2008 Thorsten Leemhuis - 1.6-3 -- rebuild - -* Sun Oct 1 2006 David Woodhouse 1.6-2 -- Review fixes - -* Tue Sep 12 2006 David Woodhouse 1.6-1 -- Initial version diff --git a/jbigkit.spec b/jbigkit.spec index 210b789..ca6c2c0 100644 --- a/jbigkit.spec +++ b/jbigkit.spec @@ -18,6 +18,10 @@ Name: jbigkit Version: 2.0 +# Facilitate http://en.opensuse.org/openSUSE:Shared_library_packaging_policy +%define libv 2 +%define libn libjbig +%define libnv %{libn}%{libv} Release: 0 Summary: JBIG1 lossless image compression tools License: GPL-2.0+ @@ -27,16 +31,17 @@ Source0: %{name}-%{version}.tar.gz Patch0: jbigkit-2.0-shlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package -n libjbig +%package -n %libnv Summary: JBIG1 lossless image compression library Group: System/Libraries +Provides: %{libn} = %version -%package -n libjbig-devel +%package -n %{libn}-devel Summary: JBIG1 lossless image compression library -- development files Group: Development/Libraries/C and C++ -Requires: libjbig = %version +Requires: %libnv = %version -%description -n libjbig +%description -n %libnv JBIG-KIT provides a portable library of compression and decompression functions with a documented interface that you can include very easily into your image or document processing software. In addition, JBIG-KIT @@ -51,7 +56,7 @@ JBIG-KIT implements the specification: which is commonly referred to as the “JBIG1 standard” -%description -n libjbig-devel +%description -n %{libn}-devel The libjbig-devel package contains files needed for development using the JBIG-KIT image compression library. @@ -64,8 +69,15 @@ formats. %patch0 -p1 %build +# TODO install docs/includes to name-with-version-suffix? export CFLAGS="%optflags -I../libjbig" CXXFLAGS="%optflags" %__make %{?_smp_mflags} +%__strip libjbig/libjbig.so.%{version} +%__strip libjbig/libjbig85.so.%{version} +%__strip pbmtools/pbmtojbg +%__strip pbmtools/jbgtopbm +%__strip pbmtools/pbmtojbg85 +%__strip pbmtools/jbgtopbm85 %check %__make test @@ -73,6 +85,7 @@ export CFLAGS="%optflags -I../libjbig" CXXFLAGS="%optflags" %install %__install -Dm 0755 libjbig/libjbig.so.%{version} %{buildroot}/%{_libdir}/libjbig.so.%version %__install -Dm 0755 libjbig/libjbig85.so.%{version} %{buildroot}/%{_libdir}/libjbig85.so.%version + %__ln_s -f libjbig.so.%{version} %{buildroot}/%{_libdir}/libjbig.so %__ln_s -f libjbig85.so.%{version} %{buildroot}/%{_libdir}/libjbig85.so @@ -87,13 +100,12 @@ export CFLAGS="%optflags -I../libjbig" CXXFLAGS="%optflags" %__install -d %{buildroot}%{_mandir}/man1 %__install -m 0644 pbmtools/*.1 %{buildroot}%{_mandir}/man1 +%__ln_s -f pbmtojbg.1 %{buildroot}%{_mandir}/man1/pbmtojbg85.1 +%__ln_s -f jbgtopbm.1 %{buildroot}%{_mandir}/man1/jbgtopbm85.1 -%clean -%__rm -rf %buildroot +%post -n %{libnv} -p /sbin/ldconfig -%post -n libjbig -p /sbin/ldconfig - -%postun -n libjbig -p /sbin/ldconfig +%postun -n %{libnv} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -101,14 +113,14 @@ export CFLAGS="%optflags -I../libjbig" CXXFLAGS="%optflags" %doc %{_mandir}/man1/* %doc COPYING ANNOUNCE TODO CHANGES pbmtools/*.txt -%files -n libjbig +%files -n %{libnv} %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/%{libn}*.so.* + +%files -n %{libn}-devel +%defattr(-,root,root) +%{_libdir}/%{libn}*.so +%{_includedir}/jbig*.h %doc COPYING ANNOUNCE TODO CHANGES libjbig/*.txt -%files -n libjbig-devel -%defattr(-,root,root) -%{_libdir}/*.so -%{_includedir}/jbig*.h - %changelog