Request 2556 (accepted)

synfig.changes Changed

synfig.spec Changed

@@ -1,17 +1,23 @@
-# Packmangroup: Libraries
-# Packmanpackagename: synfig
-# Packman: Manfred Tremmel
-# Packmanpackagedesc: Core package for synfig studio.The missing libxml++ you can find in the supplementary part of the SUSE ftp server: <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_10.0/applications/">SUSE 10.0</a>
-# Packmanpackagedesc_de: Basispaket f&uuml;r das Synfig StudioDie ben&ouml;tigte libxml++ finden Sie im Supplementary Bereich des SUSE FTP-Servers: <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_10.0/applications/">SUSE 10.0</a>
-# Packmanxxpackagedesc: Core package for synfig studio.The missing libxml++ you can find in the supplementary part of the SUSE ftp server: <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_9.3/applications/">SUSE 9.3</a> or <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_10.0/applications/">SUSE 10.0</a>
-# Packmanxxpackagedesc_de: Basispaket f&uuml;r das Synfig StudioDie ben&ouml;tigte libxml++ finden Sie im Supplementary Bereich des SUSE FTP-Servers: <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_9.3/applications/">SUSE 9.3</a> oder <a href="ftp://ftp.mathematik.uni-bielefeld.de/pub/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_10.0/applications/">SUSE 10.0</a>
-
-# norootforbuild
-
-%define major 0
-%define lib libsynfig
-%define libname %{lib}%{major}
-
+#
+# spec file for package synfig
+#
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+%define soname libsynfig
+%define sover 0
 %bcond_without ffmpeg
 %bcond_without fontconfig
 %bcond_without freetype
@@ -21,51 +27,56 @@
 %bcond_with libswscale
 %bcond_without magickpp
 %bcond_without openexr
-
+%bcond_without libdv
 Name: synfig
-Summary: Core package for synfig studio
-Summary(de): Basispaket für das Synfig Studio
-Version: 1.0
+Version: 1.0.2
 Release: 0
-Group: Productivity/Graphics/Other
+Summary: Vector based 2D animation render
 License: GPL-3.0+
-URL: http://synfig.org
-Source0: %{name}-%{version}.tar.xz
-Patch0: synfig-configure-debug.patch
-Patch1: synfig-no-buildtime.patch
-Patch2: synfig-intltoolize.patch
-Patch3: synfig-lyr_freetype.patch
-Patch4: synfig-devel-deps.patch
-%if %{with imagemagick}
-BuildRequires: ImageMagick-devel
-%endif
+Group: Productivity/Graphics/Other
+Url: http://synfig.org
+Source0: https://sourceforge.net/projects/synfig/files/releases/%{version}/source/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE debug.patch avvissu@yandex.by -- Specify the `-g' option when building
+Patch0: synfig-1.0.2_debug.patch
+# PATCH-FIX-UPSTREAM c++11.patch onlyjob@member.fsf.org [gh#synfig/synfig/#219] -- Fix906 c++11 support
+Patch1: synfig-1.0.2_c++11.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: boost-devel >= 1.53.0
 BuildRequires: gcc-c++
 BuildRequires: intltool
+BuildRequires: libmng-devel
+BuildRequires: libtool
+BuildRequires: pkgconfig(ETL)
+BuildRequires: pkgconfig(cairo) >= 1.12.0
+BuildRequires: pkgconfig(giomm-2.4) >= 2.18.2
+BuildRequires: pkgconfig(glibmm-2.4) >= 2.24.2
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libxml++-2.6)
+BuildRequires: pkgconfig(mlt++)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(pangocairo)
+BuildRequires: pkgconfig(sigc++-2.0)
+BuildRequires: pkgconfig(zlib)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with imagemagick}
+BuildRequires: pkgconfig(ImageMagick)
+%endif
 %if %{with jpeg}
 BuildRequires: libjpeg-devel
 %endif
-BuildRequires: libmng-devel
-BuildRequires: libpng12-compat-devel
-BuildRequires: libtool
-BuildRequires: pkgconfig(ETL) >= 0.04.18
 %if %{with magickpp}
 BuildRequires: pkgconfig(Magick++) >= 6.4.2
 %endif
 %if %{with openexr}
 BuildRequires: pkgconfig(OpenEXR)
 %endif
-BuildRequires: pkgconfig(cairo) >= 1.12.0
 %if %{with fontconfig}
 BuildRequires: pkgconfig(fontconfig)
 %endif
 %if %{with freetype}
 BuildRequires: pkgconfig(freetype2)
 %endif
-BuildRequires: pkgconfig(giomm-2.4) >= 2.18.2
-BuildRequires: pkgconfig(glibmm-2.4) >= 2.24.2
 %if %{with libavcodec}
 BuildRequires: pkgconfig(libavcodec)
 BuildRequires: pkgconfig(libavformat)
@@ -73,116 +84,137 @@
 %if %{with libswscale}
 BuildRequires: pkgconfig(libswscale)
 %endif
-BuildRequires: pkgconfig(libxml++-2.6)
-BuildRequires: pkgconfig(mlt++)
-BuildRequires: pkgconfig(pango)
-BuildRequires: pkgconfig(pangocairo)
-BuildRequires: pkgconfig(sigc++-2.0)
-BuildRequires: zlib-devel
-Requires: %{libname} = %{version}-%{release}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%lang_package
+%if %{with libdv}
+BuildRequires: pkgconfig(libdv)
+%endif
 
 %description
-Core package for synfig studio
-Utilities
+%{summary}.
 
-%description -l de
-Basispaket für das Synfig Studio
-Hilfsprogramme
+This package contains the command line renderer used to convert synfig .sif 
+files to raster images, videos and other formats. Layer types include 
+geometric, gradient, filter, distortion, transformation, fractal and 
+others.
 
-%package -n %{libname}
+%package -n %{soname}%{sover}
+Summary: Shared library part of %{name}
 Group: System/Libraries
-Summary: Shared library part of synfig
-Summary(de): Synfig Bibliotheken
-Provides: %{lib} = %{version}-%{release}
+Requires: %{name}-modules >= %{version}
+
+%description -n %{soname}%{sover}
+Vector based 2D animation render.
 
-%description -n %{libname}
-Core package for synfig studio
-Shared libraries
+This package contains the shared library.
 
-%description -n %{libname} -l de
-Basispaket für das Synfig Studio
-Bibliotheken
+%package modules
+Summary: Shared library part of %{name}
+Group: System/Libraries
+Requires: %{name} = %{version}
 
-%package -n %{lib}-devel
+%description modules
+Vector based 2D animation render.
+
+This package contains modules for %{name}.
+
+%package devel
+Summary: Header files and static library for the %{name} library
 Group: Development/Libraries/C and C++
-Summary: Header files and static library for the synfig library
-Requires: %{libname} = %{version}-%{release}
-Obsoletes: synfig-devel < %{version}
-Provides: synfig-devel = %{version}-%{release}
-Obsoletes: %{libname}-devel < %{version}
-Provides: %{libname}-devel = %{version}-%{release}
+Requires: %{soname}%{sover} = %{version}
+Provides: %{soname}-devel = %{version}
+Obsoletes: %{soname}-devel < %{version}
+
+%description devel
+Vector based 2D animation render.
 
-%description -n %{lib}-devel
-Core package for synfig studio
-Install %{lib}-devel if you want to compile apps with %{name} support.
+This package contains the pkgconfig, header files and libraries needed to
+develop application that use %{name}.
 
-%description -n %{lib}-devel -l de
-Basispaket für das Synfig Studio
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation/Other
+BuildArch: noarch
 
-Installieren Sie %{lib}-devel wenn Sie Anwendungen mit %{name} Support
-compilieren wollen.
+%description doc
+Vector based 2D animation render.
 
+This package provides documentation and several examples for %{name}.
 
+%lang_package
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+# Don't compile in DATE and TIME
+BUILDDATE=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%b %d %Y')
+BUILDTIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%H:%M')
+sed -e "s/__DATE__/\"$BUILDDATE\"/" \
+ -e "s/__TIME__/\"$BUILDTIME\"/" \
+ -i $(grep -rl '__DATE__\|__TIME__')
 
 %build
-autoreconf --install --force
-intltoolize -f
+autoreconf -fiv
 %configure \
-	%{?_with_ffmpeg} \
-	%{?_with_fontconfig} \
-	%{?_with_freetype} \
-	%{?_with_jpeg} \
-	%{?_with_imagemagick} \
-	%{?_with_libavcodec} \
-	%{?_with_libswscale} \
-	%{?_with_magickpp} \
-	%{?_with_openexr} \
-	--without-libdv \
-	--disable-static
-%{__make} %{?jobs:-j%{jobs}}
+ %{!?with_ffmpeg:--without-ffmpeg} \
+ %{!?with_fontconfig:--without-fontconfig} \
+ %{!?with_freetype:--without-freetype} \
+ %{!?with_jpeg:--without-jpeg} \
+ %{!?with_imagemagick:--without-imagemagick} \
+ %{?with_libavcodec:--with-libavcodec} \
+ %{!?with_libswscale:--without-libswscale} \
+ %{!?with_magickpp:--without-magickpp} \
+ %{!?with_openexr:--without-openexr} \
+ %{!?with_libdv:--without-libdv} \
+ --sysconfdir=%{_sysconfdir}/%{name}
+
+make %{?_smp_mflags}
 
 %install
-%{makeinstall}
-rm -f examples/walk/Makefile*
-chmod 644 examples/walk/frame_*.jpg
+%make_install
+
 %find_lang %{name} %{?no_lang_C} --without-gnome --without-kde
 
-%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
+find {doc,examples} -type f ! -iname \make* -exec \
+install -Dm0644 \{\} %{buildroot}%{_docdir}/%{name}/\{\} \;
 
+find %{buildroot} -type f -name \*.la -exec rm -f \{\} \;
+
+%post -n %{soname}%{sover} -p /sbin/ldconfig
+%postun -n %{soname}%{sover} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README TODO doc examples
-%{_bindir}/synfig
+%doc COPYING NEWS README TODO
+%{_bindir}/%{name}
+%dir %{_sysconfdir}/%{name}
+%config %{_sysconfdir}/%{name}/%{name}*.cfg
+%exclude %{_docdir}/%{name}/doc
+%exclude %{_docdir}/%{name}/examples
+
+%files -n %{soname}%{sover}
+%defattr(-,root,root)
+%{_libdir}/%{soname}.so.*
 
-%files -n %{libname}
+%files modules
 %defattr(-,root,root)
-%config /etc/synfig_modules.cfg
-%dir %{_libdir}/synfig
-%dir %{_libdir}/synfig/modules
-%{_libdir}/libsynfig.so.%{major}*
-%{_libdir}/synfig/modules/*.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%{_libdir}/%{name}/modules/*.so
 
-%files -n %{lib}-devel
+%files devel
 %defattr(-,root,root)
-%{_bindir}/synfig-config
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/*.*a
-%{_libdir}/synfig/modules/*.*a
-%{_libdir}/pkgconfig/synfig.pc
+%{_bindir}/%{name}-config
+%{_includedir}/%{name}*/
+%{_libdir}/%{soname}.so
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files doc
+%defattr(-,root,root)
+%{_docdir}/%{name}/doc/
+%{_docdir}/%{name}/examples/
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog

synfig-1.0.2_c++11.patch Added

synfig-1.0.2_debug.patch Added

synfig-configure-debug.patch Deleted

synfig-devel-deps.patch Deleted

@@ -1,64 +0,0 @@
----
- configure.ac |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-Index: synfig-1.0/configure.ac
-===================================================================
---- synfig-1.0.orig/configure.ac
-+++ synfig-1.0/configure.ac
-@@ -139,6 +139,7 @@ if test $with_magickpp = "yes" ; then {
- 	PKG_CHECK_MODULES(MAGICKPP, Magick++ >= 6.4.2,[
- 		with_magickpp="yes"
- 		AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
-+		CONFIG_DEPS="$CONFIG_DEPS Magick++"
- 	],[
- 		with_magickpp="no"
- 		AC_MSG_RESULT([ *** Magick++ Output target disabled])
-@@ -199,6 +200,7 @@ if test $with_libavcodec != "no" ; then
- if test $with_libavcodec = "yes" ; then {
- 	AC_DEFINE(WITH_LIBAVCODEC,[],[enable libavcodec support])
- 	AM_CONDITIONAL(WITH_LIBAVCODEC,true)
-+	CONFIG_DEPS="$CONFIG_DEPS libavcodec libavformat"
- } else {
- 	AM_CONDITIONAL(WITH_LIBAVCODEC,false)
- } ; fi
-@@ -229,6 +231,7 @@ if test $with_libavcodec = "yes" ; then
- 
- 	if test $with_libswscale = "yes" ; then {
- 		AC_DEFINE(WITH_LIBSWSCALE, [], [enable libswscale support])
-+		CONFIG_DEPS="$CONFIG_DEPS libswscale"
- 
- 		# Need to check both the new and old locations for the swscale header
- 		# Need to save flags, add swscale flags, check headers and restore flags
-@@ -261,6 +264,7 @@ AC_ARG_WITH(freetype,
- if test $with_freetype != "no" ; then {
- 	PKG_CHECK_MODULES(FREETYPE, freetype2,[
- 		with_freetype="yes"
-+		CONFIG_DEPS="$CONFIG_DEPS freetype2"
- 	],[
- 		PKG_CHECK_MODULES(FREETYPE, xft,[
- 			with_freetype="yes"
-@@ -283,6 +287,7 @@ AC_ARG_WITH(fontconfig,
- if test $with_fontconfig != "no" ; then {
- 	PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[
- 		with_fontconfig="yes"
-+		CONFIG_DEPS="$CONFIG_DEPS fontconfig"
- 	],[
- 		with_fontconfig="no"
- 	])
-@@ -306,6 +311,7 @@ if test $with_openexr = "yes" ; then {
- 	PKG_CHECK_MODULES(OPENEXR, OpenEXR,[
- 		AC_DEFINE(HAVE_OPENEXR,[], [ Define if OpenEXR is available ] )
- 		AM_CONDITIONAL(WITH_OPENEXR,true)
-+		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
- 	],
- 	[
- 		with_openexr="no"
-@@ -317,7 +323,6 @@ if test $with_openexr = "no" ; then {
- } ; fi
- if test $use_openexr_half = yes ; then {
- 	AC_MSG_RESULT([ ** Using OpenEXR Half.])
--	CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
- 	CONFIG_CFLAGS="$CONFIG_CFLAGS -DUSE_HALF_TYPE"
- 	OPENEXR_HALF_LIBS="-lHalf"
- } else {

synfig-intltoolize.patch Deleted

synfig-lyr_freetype.patch Deleted

synfig-no-buildtime.patch Deleted

synfig-1.0.tar.xz -> synfig-1.0.2.tar.gz Changed

Overview

Request 2556 (accepted)

Request History