rpms/synfig/devel synfig-0.62.00-ltld.patch, NONE, 1.1 synfig.spec, 1.3, 1.4

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/synfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24030

Modified Files:
	synfig.spec 
Added Files:
	synfig-0.62.00-ltld.patch 
Log Message:
* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-3
- Actually apply the optflags patch
- Drop bundled libltdl


synfig-0.62.00-ltld.patch:
 Makefile.am  |   15 +--------------
 configure.ac |    7 ++-----
 2 files changed, 3 insertions(+), 19 deletions(-)

--- NEW FILE synfig-0.62.00-ltld.patch ---
Do not use bundled LTDL.

Lubomir Rintel <lkundrak at v3.sk>

diff -urp synfig-0.62.00/configure.ac synfig-0.62.00.fixed/configure.ac
--- synfig-0.62.00/configure.ac	2009-12-24 04:08:29.140458700 +0100
+++ synfig-0.62.00.fixed/configure.ac	2009-12-24 03:09:32.228444125 +0100
@@ -85,8 +85,8 @@ AC_LIBTOOL_DLOPEN
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED
 AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
-AC_LIBTOOL_PATCH
+#AC_SUBST(LIBTOOL_DEPS)
+#AC_LIBTOOL_PATCH
 
 #if [[ "$LIBTOOL_PATCH_SED""x" != "x" ]] ; then {
 #	printf "Patching libtool... "
@@ -622,9 +622,6 @@ AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-# this line is required for libtool 1.5.26 but must not be present for libtool 2.2.4...
-AC_CONFIG_SUBDIRS(libltdl)
-
 CONFIG_LIBS="-lsynfig"
 CONFIG_CFLAGS="$CONFIG_CFLAGS"
 AC_SUBST(CONFIG_LIBS)
diff -urp synfig-0.62.00/Makefile.am synfig-0.62.00.fixed/Makefile.am
--- synfig-0.62.00/Makefile.am	2009-10-12 11:33:44.000000000 +0200
+++ synfig-0.62.00.fixed/Makefile.am	2009-12-24 03:10:14.522447795 +0100
@@ -26,23 +26,10 @@ MAINTAINERCLEANFILES = \
 	config.status \
 	.doc_stamp \
 	.DS_Store \
-	include/etl_profile.h.in \
-	libltdl/COPYING.LIB \
-	libltdl/Makefile.in \
-	libltdl/acinclude.m4 \
-	libltdl/config-h.in \
-	libltdl/configure.in \
-	libltdl/ltdl.h \
-	libltdl/Makefile.am \
-	libltdl/README \
-	libltdl/aclocal.m4 \
-	libltdl/configure \
-	libltdl/ltdl.c \
-	libltdl/stamp-h.in
+	include/etl_profile.h.in
 
 
 SUBDIRS = \
-	libltdl \
 	build_tools \
 	src \
 	examples \


Index: synfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synfig/devel/synfig.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- synfig.spec	20 Dec 2009 12:14:38 -0000	1.3
+++ synfig.spec	24 Dec 2009 03:29:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           synfig
 Version:        0.62.00
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Vector-based 2D animation rendering backend
 
 Group:          Applications/Multimedia
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://synfig.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         synfig-0.61.09-optflags.patch
+Patch1:         synfig-0.62.00-ltld.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ETL-devel >= 0.04.13
@@ -22,6 +23,7 @@ BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libmng-devel
 BuildRequires:  ImageMagick-c++-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  autoconf automake gettext-devel
 # FIXME: Lack of this causes synfig to segfault
 Requires:       urw-fonts
 
@@ -58,9 +60,14 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .optflags
+%patch1 -p1 -b .ltdl
+rm -rf libltdl
 
 
 %build
+aclocal -I m4
+automake
+autoconf -i --force
 %configure --disable-static --with-imagemagick --with-magickpp \
         --without-libavcodec
 %if 0%{?fedora} >= 10
@@ -110,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 24 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-3
+- Actually apply the optflags patch
+- Drop bundled libltdl
+
 * Sun Dec 20 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.62.00-2
 - Work around a segfault w/o urw-fonts