X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmupdf.git;a=blobdiff_plain;f=mupdf.spec;h=146a36007df47cdfcc70e83d8f983e64c9d3631e;hp=dfc669ca3deef54e9fb1b510c0808ffda4d179dd;hb=f735ca8151cfbff7d005ea3f15b92a806f70eb9c;hpb=80c18e69984a5c25b78069acfc447a2a8b547983

diff --git a/mupdf.spec b/mupdf.spec
index dfc669c..146a360 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,22 +1,23 @@
-# TODO: build shared library
 Summary:	MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering library
 Summary(pl.UTF-8):	MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ
 Name:		mupdf
 Version:	1.3
-Release:	0.1
-License:	AGPL v3
-Group:		Libraries
+Release:	1
+License:	AGPL v3+
+Group:		Applications/Text
 #Source0Download: http://code.google.com/p/mupdf/downloads/list?q=source
 Source0:	http://mupdf.googlecode.com/files/%{name}-%{version}-source.tar.gz
 # Source0-md5:	fe53c2a56ebd7759f5f965bc4ff66359
 Patch0:		%{name}-openjpeg.patch
 Patch1:		%{name}-curl.patch
 Patch2:		%{name}-v8.patch
+Patch3:		%{name}-shared.patch
 URL:		http://www.mupdf.com/
 BuildRequires:	curl-devel
 BuildRequires:	freetype-devel >= 2
 BuildRequires:	jbig2dec-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	openjpeg2-devel >= 2
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
@@ -24,8 +25,12 @@ BuildRequires:	v8-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	zlib-devel
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# needs symbols from one of libmupdf-js-*
+%define		skip_post_check_so	libmupdf.so.*
+
 %description
 MuPDF is a lightweight PDF, XPS and CBZ viewer and parser/rendering
 library.
@@ -34,44 +39,68 @@ library.
 MuPDF to lekka przeglądarka oraz biblioteka analizująca/renderująca
 pliki PDF, XPS i CBZ.
 
+%package libs
+Summary:	Shared MuPDF libraries
+Summary(pl.UTF-8):	Biblioteki współdzielone MuPDF
+Group:		Libraries
+
+%description libs
+Shared MuPDF libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone MuPDF.
+
 %package devel
-Summary:	Header files for MuPDF library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki MuPDF
+Summary:	Header files for MuPDF libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek MuPDF
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	freetype2-devel >= 2
+Requires:	jbig2dec-devel
+Requires:	libjpeg-devel
+Requires:	libstdc++-devel
+Requires:	openjpeg2-devel >= 2
+Requires:	openssl-devel
+Requires:	v8-devel
+Requires:	zlib-devel
 
 %description devel
-Header files for MuPDF library.
+Header files for MuPDF libraries.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki MuPDF.
+Pliki nagłówkowe bibliotek MuPDF.
 
 %package static
-Summary:	Static MuPDF library
-Summary(pl.UTF-8):	Statyczna biblioteka MuPDF
+Summary:	Static MuPDF libraries
+Summary(pl.UTF-8):	Statyczne biblioteki MuPDF
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static MuPDF library.
+Static MuPDF libraries.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka MuPDF.
+Statyczne biblioteki MuPDF.
 
 %prep
 %setup -q -n %{name}-%{version}-source
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
+# use system libs instead
 %{__rm} -r thirdparty/{curl,freetype,jbig2dec,jpeg,openjpeg,zlib}
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
 %{__make} \
 	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	V8_PRESENT=yes \
 	build=release \
+	libdir=%{_libdir} \
 	verbose=1
 
 %install
@@ -90,8 +119,8 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%post	-p /sbin/ldconfig
-#%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -106,18 +135,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mupdf.1*
 %{_mandir}/man1/mutool.1*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libmupdf.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmupdf.so.0
+%attr(755,root,root) %{_libdir}/libmupdf-js-none.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-none.so.0
+%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-v8.so.0
+
 %files devel
 %defattr(644,root,root,755)
 %doc docs/{naming,overview,progressive,refcount,thirdparty}.txt
-%{_libdir}/libmupdf.a
-%{_libdir}/libmupdf-js-none.a
-%{_libdir}/libmupdf-js-v8.a
+%attr(755,root,root) %{_libdir}/libmupdf.so
+%attr(755,root,root) %{_libdir}/libmupdf-js-none.so
+%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so
+%{_libdir}/libmupdf.la
+%{_libdir}/libmupdf-js-none.la
+%{_libdir}/libmupdf-js-v8.la
 %{_includedir}/mupdf
 
-%if 0
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmupdf.a
 %{_libdir}/libmupdf-js-none.a
 %{_libdir}/libmupdf-js-v8.a
-%endif