- pl

- added doc patch (to fix build without libgxps already installed)
- versioned runtime deps
- build -static

Changed files:
    libgxps-doc.patch -> 1.1
    libgxps.spec -> 1.5

diff --git a/libgxps-doc.patch b/libgxps-doc.patch
new file mode 100644 (file)
index 0000000..4fb40a3
--- /dev/null
+++ b/libgxps-doc.patch
@@ -0,0 +1,14 @@
+Allow docs build without already installed libgxps (gtk-doc scan generates <libgxps/gxps.h>)
+--- libgxps-0.2.1/docs/reference/Makefile.am.orig      2011-10-08 14:16:05.000000000 +0200
++++ libgxps-0.2.1/docs/reference/Makefile.am   2012-01-28 14:23:48.724403590 +0100
+@@ -68,8 +68,8 @@
+ # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+ # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+ INCLUDES=                             \
+-      -I$(top_srcdir)/libgxps         \
+-      -I$(top_builddir)/libgxps       \
++      -I$(top_srcdir)         \
++      -I$(top_builddir)       \
+       $(GXPS_CFLAGS)
+ 
+ GTKDOC_LIBS=                                  \

diff --git a/libgxps.spec b/libgxps.spec
index 8b8ec3912c1fa8efdb7ce040158af365d32297c1..9eae948868e2ec318baf01e4c93c84a9cf36eb16 100644 (file)
--- a/libgxps.spec
+++ b/libgxps.spec
@@ -1,4 +1,5 @@
 Summary:       XPS documents library
+Summary(pl.UTF-8):     Biblioteka do obsługi dokumentów XPS
 Name:          libgxps
 Version:       0.2.1
 Release:       1
@@ -6,6 +7,7 @@ License:        LGPL v2
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgxps/0.2/%{name}-%{version}.tar.xz
 # Source0-md5: 1ff62407800ec96e7f1473e67757ec01
+Patch0:                %{name}-doc.patch
 URL:           http://live.gnome.org/libgxps
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.10
@@ -21,15 +23,23 @@ BuildRequires:      libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
+BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+Requires:      cairo >= 1.10.0
+Requires:      glib2 >= 1:2.24.0
+Requires:      libarchive >= 2.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 libgxps is a GObject based library for handling and rendering XPS
 documents.
 
+%description -l pl.UTF-8
+libgxps to oparta na szkielecie GObject biblioteka do obsługi i
+renderowania dokumentów XPS.
+
 %package devel
 Summary:       Header files for libgxps library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libgxps
@@ -45,6 +55,18 @@ Header files for libgxps library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libgxps.
 
+%package static
+Summary:       Static libgxps libary
+Summary(pl.UTF-8):     Statyczna biblioteka libgxps
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static libgxps libary.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libgxps.
+
 %package apidocs
 Summary:       libgxps API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libgxps
@@ -59,6 +81,7 @@ Dokumentacja API biblioteki libgxps.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -69,8 +92,7 @@ Dokumentacja API biblioteki libgxps.
 %configure \
        --with-html-dir=%{_gtkdocdir} \
        --enable-gtk-doc \
-       --disable-silent-rules \
-       --disable-static
+       --disable-silent-rules
 %{__make}
 
 %install
@@ -79,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -106,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libgxps
 %{_pkgconfigdir}/libgxps.pc
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgxps.a
+
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libgxps