diff -uNrp libpoppler-0.4.5/libpoppler.spec libpoppler-0.4.4/libpoppler.spec --- libpoppler-0.4.5/libpoppler.spec 2006-02-13 16:20:42 +0300 +++ libpoppler-0.4.4/libpoppler.spec 2006-02-09 13:33:39 +0300 @@ -1,21 +1,23 @@ + +%def_disable static + Name: libpoppler -Version: 0.4.5 -Release: alt1 +Version: 0.4.4 +Release: alt2 -Summary: PDF rendering library -License: LGPL Group: System/Libraries -Url: http://poppler.sourceforge.net/ -Packager: Andrey Semenov +Summary: PDF rendering library +License: GPL +Url: http://poppler.freedesktop.org/ Source: poppler-%version.tar.gz +Patch1: poppler-0.4.4-qt-libs.patch -# Automatically added by buildreq on Wed May 25 2005 -BuildRequires: fontconfig-devel freetype2-devel gcc-c++ gcc-g77 -BuildRequires: glib2-devel libatk-devel -BuildRequires: libgtk+2-devel libjpeg-devel libpango-devel -BuildRequires: libqt3-devel libstdc++-devel pkgconfig -BuildRequires: xorg-x11-devel zlib-devel +# Automatically added by buildreq on Wed Feb 08 2006 +#BuildRequires: fontconfig-devel freetype2-devel gcc-c++ gcc-g77 glib2-devel glibc-devel-static imake libICE-devel libX11-devel libXt-devel libatk-devel libcairo-devel libg2c-devel libgtk+2-devel libjpeg-devel libpango-devel libqt3-devel libqt4-core libstdc++-devel linux-libc-headers pkg-config xorg-cf-files xorg-x11-proto-devel zlib-devel +BuildRequires: fontconfig-devel freetype2-devel gcc-c++ glib2-devel glibc-devel-static +BuildRequires: xorg-x11-devel libatk-devel libcairo-devel libgtk+2-devel +BuildRequires: libjpeg-devel libpango-devel libqt3-devel libstdc++-devel pkg-config zlib-devel %description Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg @@ -32,54 +34,129 @@ base to the world, we hope that over tim adopt poppler. After all, we only need one application to use poppler to break even. +%package -n %name-qt +Summary: Qt3 frontend library for %name +Group: System/Libraries +Requires: %name = %version-%release +%description -n %name-qt +Qt3 frontend library for %name -%package -n %name-devel -Summary: Libraries, includes, etc. to develop poppler applications +%package -n %name-glib +Summary: Glib frontend library for %name Group: System/Libraries -Requires: %name = %version +Requires: %name = %version-%release +%description -n %name-glib +Glib frontend library for %name +%package -n %name-devel +Summary: Development files for %name +Group: Development/C +Requires: %name = %version-%release %description -n %name-devel -Libraries, include files, etc you can use to develop poppler applications. +Libraries, include files, etc you can use to develop poppler applications + +%package -n %name-glib-devel +Summary: Development files for %name-glib +Group: Development/GNOME and GTK+ +Requires: %name-devel = %version-%release +%description -n %name-glib-devel +Libraries, include files, etc you can use to develop +poppler applications with Glib/Gtk+ + +%package -n %name-qt-devel +Summary: Development files for %name-qt +Group: Development/KDE and QT +Requires: %name-devel = %version-%release +%description -n %name-qt-devel +Libraries, include files, etc you can use to develop +poppler applications with Qt3 %package -n %name-devel-static Summary: Static libraries for libpoppler -Group: System/Libraries -PreReq: %name-devel = %version-%release -License: GPL - +Group: Development/Other +Requires: %name-devel = %version-%release +Requires: %name-qt-devel = %version-%release +Requires: %name-glib-devel = %version-%release %description -n %name-devel-static This package contains development libraries required for packaging -statically linked libpoppler-based software. +statically linked libpoppler-based software + %prep %setup -q -n poppler-%version +%patch1 -p1 +%__autoreconf + %build -%configure +%configure \ + --disable-rpath \ + %{subst_enable static} \ + --enable-shared \ + --enable-dependency-tracking \ + --enable-compile-warnings=yes \ + --enable-zlib \ + --enable-a4-paper + %make_build + %install %makeinstall -%post -n %name -p %post_ldconfig +%post -n %name -p %post_ldconfig %postun -n %name -p %postun_ldconfig +# +%post -n %name-qt -p %post_ldconfig +%postun -n %name-qt -p %postun_ldconfig +# +%post -n %name-glib -p %post_ldconfig +%postun -n %name-glib -p %postun_ldconfig + %files -n %name -%doc AUTHORS ChangeLog INSTALL NEWS README TODO -%_libdir/libpoppler*.so.* +%doc AUTHORS ChangeLog NEWS README* TODO +%_libdir/libpoppler.so.* + +%files -n %name-glib +%_libdir/libpoppler-glib.so.* + +%files -n %name-qt +%_libdir/libpoppler-qt.so.* %files -n %name-devel %_includedir/poppler %_libdir/*.so -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/poppler.pc +%_libdir/pkgconfig/poppler-splash.pc +%files -n %name-glib-devel +%_includedir/poppler +%_libdir/*.so +%_libdir/pkgconfig/poppler-cairo.pc +%_libdir/pkgconfig/poppler-glib.pc + +%files -n %name-qt-devel +%_includedir/poppler +%_libdir/*.so +%_libdir/pkgconfig/poppler-qt.pc + +%if_enabled static %files -n %name-devel-static %_libdir/*.a +%endif %changelog -* Sat Feb 11 2006 Andrey Semenov 0.4.5-alt1 -- 0.4.5 +* Wed Feb 08 2006 Sergey V Turchin 0.4.4-alt2 +- fix linking with qt +- split qt,glib,devel libraries to subpackages +- fix %%url +- fix requires +- fix build requires + +* Thu Feb 02 2006 ALT QA Team Robot 0.4.4-alt1.1 +- Rebuilt for new pkg-config dependencies. * Wed Jan 11 2006 Andrey Semenov 0.4.4-alt1 - new version diff -uNrp libpoppler-0.4.5/poppler-0.4.4-qt-libs.patch libpoppler-0.4.4/poppler-0.4.4-qt-libs.patch --- libpoppler-0.4.5/poppler-0.4.4-qt-libs.patch 1970-01-01 03:00:00 +0300 +++ libpoppler-0.4.4/poppler-0.4.4-qt-libs.patch 2006-02-08 19:19:54 +0300 @@ -0,0 +1,11 @@ +--- poppler-0.4.4/configure.ac~ 2006-01-11 00:28:11 +0300 ++++ poppler-0.4.4/configure.ac 2006-02-08 19:19:27 +0300 +@@ -384,7 +384,7 @@ fi + + dnl Set the variables + POPPLER_QT_CXXFLAGS="-I$qt_incdir" +-POPPLER_QT_LIBS="$qt_libdir/$qt_test_library" ++POPPLER_QT_LIBS="-L$qt_libdir -lqt-mt" + + AC_SUBST(POPPLER_QT_CXXFLAGS) + AC_SUBST(POPPLER_QT_LIBS)