- up to 0.64.2

- some cleanups

diff --git a/synfig-m4.patch b/synfig-m4.patch
new file mode 100644 (file)
index 0000000..37cb3bc
--- /dev/null
+++ b/synfig-m4.patch
@@ -0,0 +1,13 @@
+--- synfig-0.64.2.orig/m4/subs.m4      2014-04-07 14:04:51.000000000 +0200
++++ synfig-0.64.2/m4/subs.m4   2014-11-16 22:17:50.308836164 +0100
+@@ -88,8 +88,8 @@
+       esac
+ 
+ 
+-      CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"
+-      CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"
++      CXXFLAGS="`echo $CXXFLAGS | sed 's:-g : :; s:-g$::'` $debug_flags"
++      CFLAGS="`echo $CFLAGS | sed 's:-g : :; s:-g$::'` $debug_flags"
+ 
+       AC_MSG_RESULT([$debug_flags])
+ ])

diff --git a/synfig.spec b/synfig.spec
index 0847ee4d257b5b3d09f03deb7f6c85a6d61e1a1c..ee94173707077529d50272f2f7ee3db101c538d1 100644 (file)
--- a/synfig.spec
+++ b/synfig.spec
@@ -1,19 +1,16 @@
 Summary:       Vector-based 2D animation software package
 Summary(pl.UTF-8):     Pakiet oprogramowania do wektorowych animacji 2D
 Name:          synfig
-Version:       0.61.07
-Release:       0.1
+Version:       0.64.2
+Release:       1
 License:       GPL v2
 Group:         Applications/Graphics
-Source0:       http://dl.sourceforge.net/synfig/synfig-0.61.07.tar.gz
-# Source0-md5: c18c23abe8db6d856f39fe1617e05612
-Patch0:                %{name}-openexr.patch
-Patch1:        %{name}-noreconf.patch
-Patch2:        %{name}-fix-stringh.patch
-Patch3:        %{name}-crazy-debugging.patch
-Patch4:        %{name}-includes.patch
-URL:           http://www.synfig.com/
-BuildRequires: ETL
+Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: 6ac9536e4d0a584d57e64a8eca38e6c3
+Patch0:                %{name}-m4.patch
+URL:           http://www.synfig.org/
+BuildRequires: ETL >= 0.04.17
+BuildRequires: boost-devel >= 1.32.0
 BuildRequires: libxml++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,40 +44,11 @@ Pliki nagłówkowe Synfiga.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1
 
 %build
-. "config/build.cfg"
-
-SED_SCRIPT="
-s/@PACKAGE@/$PACKAGE/g;
-s/@PACKAGE_NAME@/$PACKAGE_NAME/g;
-s/@PACKAGE_BUGREPORT@/$PACKAGE_BUGREPORT/g;
-s/@PACKAGE_TARNAME@/$PACKAGE_TARNAME/g;
-s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;
-s|@SVN_REPOSITORY@|$SVN_REPOSITORY|g;
-s/@VERSION@/$VERSION/g;
-s/@API_VERSION@/$API_VERSION/g;
-s/@VERSION_MAJ@/$VERSION_MAJ/g;
-s/@VERSION_MIN@/$VERSION_MIN/g;
-s/@VERSION_REV@/$VERSION_REV/g;
-s/@VERSION_REL@/$VERSION_REL/g;
-s/@CFLAGS@//g;
-"
-
-for FILENAME in doxygen.cfg pkgconfig.pc; do 
-       sed "$SED_SCRIPT" < "config/$FILENAME.in" > $FILENAME;
-done
-
-mv pkgconfig.pc "$PACKAGE_TARNAME.pc.in"
-
-sed "$SED_SCRIPT" < "config/configure.ac" > configure.ac
-
-%{__libtoolize} --ltdl
-%{__aclocal} -I config
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure
@@ -91,20 +59,22 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc NEWS README TODO
 %attr(755,root,root) %{_bindir}/synfig*
 %attr(755,root,root) %{_libdir}/libsynfig.so.*.*.*
 %dir %{_libdir}/synfig
 %dir %{_libdir}/synfig/modules
-%attr(755,root,root) %{_libdir}/synfig/modules/*.so.*
+%attr(755,root,root) %{_libdir}/synfig/modules/*.so
 %{_libdir}/synfig/modules/*.la
 # XXX: %config() ???
 %{_sysconfdir}/synfig_modules.cfg