- added qt patch to fix qt wrapper build, updated link patch, added glib,qt BRs

- separated glib and qt wrappers, release 2

Changed files:
    poppler.spec -> 1.10

diff --git a/poppler.spec b/poppler.spec
index c69d0b1648cbc4fdc735ac7bb52141303351c944..480f5e58ff374009ba86eb0ca18886136b7fd3d4 100644 (file)
--- a/poppler.spec
+++ b/poppler.spec
@@ -6,21 +6,24 @@ Summary:      PDF rendering library
 Summary(pl):   Biblioteka renderuj±ca PDF
 Name:          poppler
 Version:       0.3.0
-Release:       1
+Release:       2
 License:       GPL
 Group:         Libraries
 Source0:       http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
 # Source0-md5: 4efb701e536d55849d610f3ff45654b1
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-qt.patch
 URL:           http://poppler.freedesktop.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 %{?with_cairo:BuildRequires:   cairo-devel >= 0.4.0}
 BuildRequires: fontconfig-devel
 BuildRequires: freetype-devel >= 2.0
+BuildRequires: gtk+2-devel >= 2.0.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
 BuildRequires: pkgconfig
+BuildRequires: qt-devel
 %{?with_cairo:Requires:        cairo >= 0.4.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,9 +63,86 @@ Poppler static libraries.
 %description static -l pl
 Statyczne biblioteki Poppler.
 
+%package glib
+Summary:       GLib wrapper for poppler
+Summary(pl):   Wrapper GLib dla popplera
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description glib
+GLib wrapper for poppler.
+
+%description glib -l pl
+Wrapper GLib dla popplera.
+
+%package glib-devel
+Summary:       Header files for GLib wrapper for poppler
+Summary(pl):   Pliki nag³ówkowe wrappera GLib dla popplera
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-glib = %{version}-%{release}
+Requires:      gtk+2-devel >= 2.0.0
+
+%description glib-devel
+Header files for GLib wrapper for poppler.
+
+%description glib-devel -l pl
+Pliki nag³ówkowe wrappera GLib dla popplera.
+
+%package glib-static
+Summary:       Static version of GLib wrapper for poppler
+Summary(pl):   Statyczna wersja wrappera GLib dla popplera
+Group:         Development/Libraries
+Requires:      %{name}-glib-devel = %{version}-%{release}
+
+%description glib-static
+Static version of GLib wrapper for poppler.
+
+%description glib-static -l pl
+Statyczna wersja wrappera GLib dla popplera.
+
+%package qt
+Summary:       Qt wrapper for poppler
+Summary(pl):   Wrapper Qt dla popplera
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description qt
+Qt wrapper for poppler.
+
+%description qt -l pl
+Wrapper Qt dla popplera.
+
+%package qt-devel
+Summary:       Header files for Qt wrapper for poppler
+Summary(pl):   Pliki nag³ówkowe wrappera Qt dla popplera
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-qt = %{version}-%{release}
+Requires:      qt-devel
+
+%description qt-devel
+Header files for Qt wrapper for poppler.
+
+%description qt-devel -l pl
+Pliki nag³ówkowe wrappera Qt dla popplera.
+
+%package qt-static
+Summary:       Static version of Qt wrapper for poppler
+Summary(pl):   Statyczna wersja wrappera Qt dla popplera
+Group:         Development/Libraries
+Requires:      %{name}-qt-devel = %{version}-%{release}
+
+%description qt-static
+Static version of Qt wrapper for poppler.
+
+%description qt-static -l pl
+Statyczna wersja wrappera Qt dla popplera.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -71,6 +151,7 @@ Statyczne biblioteki Poppler.
 %{__autoheader}
 %{__automake}
 %configure \
+       QTLIB=%{_libdir} \
        %{!?with_cairo:--disable-cairo-output} \
        --enable-a4-paper
 %{__make}
@@ -87,18 +168,58 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
+%post  glib -p /sbin/ldconfig
+%postun        glib -p /sbin/ldconfig
+
+%post  qt -p /sbin/ldconfig
+%postun        qt -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libpoppler.so
+%{_libdir}/libpoppler.la
 %{_includedir}/poppler
-%{_pkgconfigdir}/*.pc
+%exclude %{_includedir}/poppler/glib
+%exclude %{_includedir}/poppler/poppler-qt.h
+%{_pkgconfigdir}/poppler.pc
+%{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc}
+%{_pkgconfigdir}/poppler-splash.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libpoppler.a
+
+%files glib
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
+
+%files glib-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-glib.so
+%{_libdir}/libpoppler-glib.la
+%{_includedir}/poppler/glib
+%{_pkgconfigdir}/poppler-glib.pc
+
+%files glib-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-glib.a
+
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-qt.so.*.*.*
+
+%files qt-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-qt.so
+%{_libdir}/libpoppler-qt.la
+%{_includedir}/poppler/poppler-qt.h
+%{_pkgconfigdir}/poppler-qt.pc
+
+%files qt-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-qt.a