packages (DEVEL): poppler/poppler-link.patch, poppler/poppler.spec - up to ...

[lisu]

Author: lisu                         Date: Thu Oct 21 07:54:25 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 0.15.1
- add -link.patch to avoid unresolved symbols
- bump version of libpoppler soname

---- Files affected:
packages/poppler:
   poppler-link.patch (1.5 -> 1.5.2.1) , poppler.spec (1.115.2.1 -> 1.115.2.2) 

---- Diffs:

================================================================
Index: packages/poppler/poppler-link.patch
diff -u packages/poppler/poppler-link.patch:1.5 packages/poppler/poppler-link.patch:1.5.2.1
--- packages/poppler/poppler-link.patch:1.5	Thu Dec 15 17:54:39 2005
+++ packages/poppler/poppler-link.patch	Thu Oct 21 09:54:20 2010
@@ -1,12 +1,12 @@
-diff -aurN poppler-0.4.3.orig/poppler/Makefile.am poppler-0.4.3/poppler/Makefile.am
---- poppler-0.4.3.orig/poppler/Makefile.am	2005-12-12 22:46:47.000000000 +0100
-+++ poppler-0.4.3/poppler/Makefile.am	2005-12-15 17:50:43.000000000 +0100
-@@ -90,7 +90,7 @@
- 	$(arthur_libs)				\
- 	$(libjpeg_libs)				\
- 	$(zlib_libs)				\
--	$(FREETYPE_LIBS)
-+	$(FREETYPE_LIBS) -lfontconfig
+--- poppler-0.15.1/qt/Makefile.am~	2010-07-24 01:18:28.000000000 +0200
++++ poppler-0.15.1/qt/Makefile.am	2010-10-21 09:46:02.445323902 +0200
+@@ -28,7 +28,8 @@
+ 	$(top_builddir)/poppler/libpoppler.la	\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+-	$(FONTCONFIG_LIBS)
++	$(FONTCONFIG_LIBS)			\
++	-lqt-mt
+ 
+ libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
  
- poppler_includedir = $(includedir)/poppler
- poppler_include_HEADERS =	\

================================================================
Index: packages/poppler/poppler.spec
diff -u packages/poppler/poppler.spec:1.115.2.1 packages/poppler/poppler.spec:1.115.2.2
--- packages/poppler/poppler.spec:1.115.2.1	Fri Sep 17 09:38:05 2010
+++ packages/poppler/poppler.spec	Thu Oct 21 09:54:20 2010
@@ -13,12 +13,13 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.15.0
+Version:	0.15.1
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	ddf3f85d92102766cf1015583593785c
+Patch0:		%{name}-link.patch
+# Source0-md5:	e198d5b4d2b1f0f75a81451b79b1e57e
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
@@ -272,6 +273,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -328,7 +330,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.8
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.9
 
 %files devel
 %defattr(644,root,root,755)
@@ -438,6 +440,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115.2.2  2010/10/21 07:54:20  lisu
+- up to 0.15.1
+- add -link.patch to avoid unresolved symbols
+- bump version of libpoppler soname
+
 Revision 1.115.2.1  2010/09/17 07:38:05  lisu
 - updated to 0.15.0
 - bump version of libpoppler and libpoppler-glib sonames
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler-link.patch?r1=1.5&r2=1.5.2.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poppler/poppler.spec?r1=1.115.2.1&r2=1.115.2.2&f=u