- updated link patch (for libgsf and libcroco)

- added libgsf deps (with bconds - it's optional, on by default)
- added deps to -devel

Changed files:
    librsvg-link.patch -> 1.3
    librsvg.spec -> 1.52

diff --git a/librsvg-link.patch b/librsvg-link.patch
index 55a3719205ae4c2fba7e1234d0208854c922f997..af8f019e59cb432fa2792f64105b58c344eafea6 100644 (file)
--- a/librsvg-link.patch
+++ b/librsvg-link.patch
@@ -1,18 +1,21 @@
-diff -Nru librsvg-2.2.2.orig/Makefile.am librsvg-2.2.2/Makefile.am
---- librsvg-2.2.2.orig/Makefile.am     Sat Feb  1 22:17:27 2003
-+++ librsvg-2.2.2/Makefile.am  Mon Feb  3 14:50:45 2003
-@@ -48,6 +48,8 @@
+--- librsvg-2.3.1/Makefile.am.orig     2003-06-21 23:31:33.000000000 +0200
++++ librsvg-2.3.1/Makefile.am  2003-07-17 00:38:56.000000000 +0200
+@@ -47,7 +47,7 @@
+       rsvg.c
  
- librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@
+ librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined -export-dynamic
+-librsvg_2_la_LIBADD = $(LIBRSVG_LIBS)
++librsvg_2_la_LIBADD = $(LIBRSVG_LIBS) $(LIBGSF_LIBS) $(LIBRSVG_LIBS)
  
-+librsvg_2_la_LIBADD = $(LIBRSVG_LIBS)
-+
  librsvgincdir = $(includedir)/librsvg-2/librsvg
  librsvginc_HEADERS = $(GSFHEADERS) \
-       rsvg.h \
-@@ -69,7 +71,6 @@
+@@ -69,10 +69,8 @@
+       -DDATADIR="\"$(datadir)\""
+ 
  DEPS = $(top_builddir)/librsvg-2.la
- LDADDS =$(LIBGSF_LIBS)\
+-LDADDS =$(LIBGSF_LIBS)\
+-      $(LIBCROCO_LIBS)\
++LDADDS =\
        $(top_builddir)/librsvg-2.la \
 -      $(LIBRSVG_LIBS) \
        $(POPT_LIBS)

diff --git a/librsvg.spec b/librsvg.spec
index 83a339bdec81c5207af767c3f39311489be189d5..88342a1fab9f794be64f2e1544b034f7006e226f 100644 (file)
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -1,7 +1,8 @@
-
+#
 # Conditional build
 # _without_gimp                - without gimp svg plugin
-
+# _without_libgsf      - without libgsf (used for run-time decompression)
+#
 %ifarch ppc
 %define        _without_gimp   1
 %endif
@@ -27,11 +28,14 @@ BuildRequires:      freetype-devel >= 2.0.1
 %{!?_without_gimp:BuildRequires: gimp-devel >= 1.3.12}
 BuildRequires: gtk+2-devel >= 2.2.0
 BuildRequires: libart_lgpl-devel >= 2.3.11
+# TODO: libcroco-devel >= 0.1.0 (optional)
+%{!?_without_libgsf:BuildRequires:     libgsf-devel >= 1.6.0}
 BuildRequires: libpng-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.1
-BuildRequires: popt-devel
+BuildRequires: popt-devel >= 1.5
 Requires:      gtk+2 >= 2.2.0
+Requires:      popt >= 1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     librsvg0
 
@@ -60,6 +64,10 @@ Summary(ru): 
 Summary(uk):   â¦Â̦ÏÔÅÞΦ ̦ÎËÉ ÔÁ ÆÁÊÌÉ ÚÁÇÏÌÏ×Ë¦× ÄÌÑ ÒÏÚÒÏÂËÉ Ú librsvg
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      gtk+2-devel >= 2.2.0
+Requires:      libart_lgpl-devel >= 2.3.11
+%{!?_without_libgsf:Requires:  libgsf-devel >= 1.6.0}
+Requires:      libxml2-devel >= 2.5.1
 Obsoletes:     librsvg0-devel
 
 %description devel
@@ -123,7 +131,8 @@ Wtyczka SVG dla Gimpa.
 %{__autoconf}
 %{__automake}
 %configure \
-    %{?_without_gimp:--without-gimp}
+       %{?_without_gimp:--without-gimp} \
+       %{?_without_libgsf:--without-svgz}
 
 %install
 rm -rf $RPM_BUILD_ROOT