- removed static modules and directories belonging to gtk+

- added link patch to fix library linking
- libtoolize to fix libtool (required librsvg already intalled - relink problem)
- added rsvg program, release 3

Changed files:
    librsvg-link.patch -> 1.1
    librsvg.spec -> 1.25

diff --git a/librsvg-link.patch b/librsvg-link.patch
new file mode 100644 (file)
index 0000000..54326c1
--- /dev/null
+++ b/librsvg-link.patch
@@ -0,0 +1,19 @@
+--- librsvg-2.1.1/Makefile.am.orig     Mon Oct 14 10:01:57 2002
++++ librsvg-2.1.1/Makefile.am  Sun Nov  3 11:37:29 2002
+@@ -27,6 +27,8 @@
+ 
+ librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@
+ 
++librsvg_2_la_LIBADD = $(LIBRSVG_LIBS)
++
+ librsvgincdir = $(includedir)/librsvg-2/librsvg
+ librsvginc_HEADERS = \
+       rsvg.h \
+@@ -47,7 +49,6 @@
+ 
+ DEPS = $(top_builddir)/librsvg-2.la
+ LDADDS = $(top_builddir)/librsvg-2.la \
+-      $(LIBRSVG_LIBS) \
+       $(POPT_LIBS)
+ 
+ rsvg_SOURCES=test-rsvg.c

diff --git a/librsvg.spec b/librsvg.spec
index b288efffd2e235e922c5798a056437046812385b..71d4ab11dfe7da20d5618927221a6dc7a3b0b38a 100644 (file)
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -5,15 +5,19 @@ Summary(uk):  SVG ¦
 Summary(uk):   SVG ¦Â̦ÏÔÅËÁ
 Name:          librsvg
 Version:       2.1.1
-Release:       2
+Release:       3
 License:       LGPL
 Vendor:                GNOME
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
+Patch0:                %{name}-link.patch
 URL:           http://nautilus.eazel.com/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: freetype-devel >= 2.0.1
 BuildRequires: gtk+2-devel >= 2.0.6
 BuildRequires: libpng-devel
+BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.4.23
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,8 +90,13 @@ librsvg.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 
 %install
@@ -97,18 +106,19 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_libdir}/*.la
-%{_libdir}/gtk-2.0
-%{_datadir}/*
+%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/*.??
+%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/loaders/*.??
+%{_datadir}/themes/bubble
 
 %files devel
 %defattr(644,root,root,755)