Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 48

synfig.spec Changed

@@ -1,7 +1,10 @@
 %define build_flavor @BUILD_FLAVOR@%nil
-%define     pkg synfig
-%define soname libsynfig
-%define sover 0
+%define pkg synfig
+%define soname_core libsynfig
+%define sover_core 0
+%define soname_studio libsynfigapp
+%define sover_studio 0
+%global __provides_exclude_from ^%_libdir/%pkg/^/+/.*\\.so(|\\.0-9.*)$
 Name:           synfig
 Version:        0
 Release:        0
@@ -9,13 +12,14 @@
 License:        GPL-3.0+
 URL:            https://synfig.org
 Source0:        %pkg-%version.tar
-#atch0:         synfig.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
-BuildRequires:  gettext-tools
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+Requires:       libmlt7-modules
+Conflicts:      synfig-modules < %version-%release
+Conflicts:      synfig-modules-debuginfo < %version-%release
 #
 %description
 Synfig Studio is a free and open-source 2D animation software,
@@ -31,7 +35,7 @@
 others.
 
 %if "%build_flavor" == ""
-%package -n     %soname%sover
+%package -n     %soname_core%sover_core
 BuildRequires:  intltool
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmng-devel
@@ -57,27 +61,17 @@
 BuildRequires:  pkgconfig(sigc++-2.0)
 BuildRequires:  pkgconfig(zlib)
 Summary:        Shared library part of %pkg
-Requires:       %pkg-modules = %version-%release
 
-%description -n %soname%sover
+%description -n %soname_core%sover_core
 Vector based 2D animation render.
 
 This package contains the shared library.
 
-%package        modules
-Summary:        Shared library part of %pkg
-Requires:       %pkg = %version-%release
-
-%description    modules
-Vector based 2D animation render.
-
-This package contains modules for %pkg.
-
 %package        devel
-Summary:        Header files and static library for the %pkg library
-Requires:       %soname%sover = %version-%release
-Provides:       %soname-devel = %version-%release
-Obsoletes:      %soname-devel < %version-%release
+Summary:        Header files for the %pkg library
+Requires:       %soname_core%sover_core = %version-%release
+Provides:       %soname_core-devel = %version-%release
+Obsoletes:      %soname_core-devel < %version-%release
 
 %description    devel
 Vector based 2D animation render.
@@ -112,14 +106,27 @@
 %if "%build_flavor" == "studio"
 %package -n     synfigstudio
 BuildRequires:  intltool
+BuildRequires:  %soname_core%sover_core
+BuildRequires:  %pkg
 BuildRequires:  pkgconfig(ETL)
 BuildRequires:  pkgconfig(synfig)
 BuildRequires:  pkgconfig(gtkmm-3.0)
 BuildRequires:  pkgconfig(fontconfig)
-Summary:        Shared library part of %pkg
+Summary:        GUI of %pkg
 Requires:       %pkg = %version
+Requires:       %soname_studio%sover_studio = %version
 
 %description -n synfigstudio
+
+%package -n     synfigstudio-devel
+Summary:        Header files for the %soname_studio%sover_studio library
+Requires:       %soname_studio%sover_studio = %version
+%description -n synfigstudio-devel
+
+%package -n     %soname_studio%sover_studio
+Summary:        Shared library part of %pkg
+%description -n %soname_studio%sover_studio
+%lang_package
 %endif
 
 %prep
@@ -151,9 +158,10 @@
 CXXFLAGS='%optflags -Wno-deprecated-declarations -Wno-unused-parameter'
 %configure --help
 %configure \
+	--enable-nls \
 	--disable-update-mimedb \
 	%nil
-%make_build
+%make_build -k
 
 %install
 %if "%build_flavor" == ""
@@ -166,31 +174,32 @@
 pushd synfig-studio
 %endif
 %make_install
-
-%if "%build_flavor" == ""
 popd
-%find_lang %pkg %{?no_lang_C} --without-gnome --without-kde
-
 find %buildroot -type f -name '*.la' -print -delete
+%if "%build_flavor" == ""
+%find_lang %pkg %{?no_lang_C} --without-gnome --without-kde
+%endif
+%if "%build_flavor" == "studio"
+%find_lang synfigstudio %{?no_lang_C} --without-gnome --without-kde
+%endif
 
-%post -n %soname%sover -p /sbin/ldconfig
-%postun -n %soname%sover -p /sbin/ldconfig
+%if "%build_flavor" == ""
+%post -n %soname_core%sover_core -p /sbin/ldconfig
+%postun -n %soname_core%sover_core -p /sbin/ldconfig
 
 %files
 %license LICENSE
 %_bindir/%pkg
+%_libdir/%pkg
 %config %_sysconfdir/*
 
-%files -n %soname%sover
-%_libdir/%soname.so.*
-
-%files modules
-%_libdir/%pkg
+%files -n %soname_core%sover_core
+%_libdir/%soname_core.so.*
 
 %files devel
 %_bindir/%pkg-config
 %_includedir/*
-%_libdir/%soname.so
+%_libdir/%soname_core.so
 %_libdir/pkgconfig/*.pc
 
 %files doc
@@ -207,7 +216,26 @@
 %endif
 #
 %if "%build_flavor" == "studio"
+%post -n %soname_studio%sover_studio -p /sbin/ldconfig
+%postun -n %soname_studio%sover_studio -p /sbin/ldconfig
+
+%files -n %soname_studio%sover_studio
+%_libdir/%soname_studio.so.*
+
+%files lang -f synfigstudio.lang
+
 %files -n synfigstudio
+%_bindir/*
+%_datadir/%pkg
+%_datadir/appdata/*
+%_datadir/applications/*
+%_datadir/icons/*
+%_datadir/mime-info
+%_datadir/mime/packages/*
+
+%files -n synfigstudio-devel
+%_includedir/*
+%_libdir/%soname_studio.so
 %endif
 
 %changelog

synfig.patch Deleted

_service Changed

@@ -237,342 +237,15 @@
 		<param name="exclude">synfig-studio/debugcrash</param>
 		<param name="exclude">synfig-studio/docs/bones_gui.txt</param>
 		<param name="exclude">synfig-studio/images/CMakeLists.txt</param>
-		<param name="exclude">synfig-studio/images/about_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_add_to_set_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_doc_icons.sif</param>
-		<param name="exclude">synfig-studio/images/action_export_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_flat_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_innerrounded_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_interpolate_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_offpeak_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_peak_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_remove_from_set_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_rounded_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_set_layer_description_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_squared_interpolation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/action_unexport_icon.sif</param>
-		<param name="exclude">synfig-studio/images/animate_mode_icons.sif</param>
-		<param name="exclude">synfig-studio/images/background_rendering_icon.sif</param>
-		<param name="exclude">synfig-studio/images/canvas_and_importimage_icons.sif</param>
-		<param name="exclude">synfig-studio/images/clear_redo_icon.sif</param>
-		<param name="exclude">synfig-studio/images/clear_undo_icon.sif</param>
-		<param name="exclude">synfig-studio/images/decr_resolution_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_angle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_position_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_radius_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_tangent_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_vertex_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duck_width_icon.sif</param>
-		<param name="exclude">synfig-studio/images/duplicate_icon.sif</param>
-		<param name="exclude">synfig-studio/images/framedial_icons.sif</param>
-		<param name="exclude">synfig-studio/images/graphs_icon.sif</param>
-		<param name="exclude">synfig-studio/images/group_icon.sif</param>
-		<param name="exclude">synfig-studio/images/history_icon.sif</param>
-		<param name="exclude">synfig-studio/images/incr_resolution_icon.sif</param>
-		<param name="exclude">synfig-studio/images/index.theme</param>
-		<param name="exclude">synfig-studio/images/info_icon.sif</param>
-		<param name="exclude">synfig-studio/images/installer_logo.sif</param>
-		<param name="exclude">synfig-studio/images/installer_logo_osx.sif</param>
-		<param name="exclude">synfig-studio/images/interpolation_type_icons.sif</param>
-		<param name="exclude">synfig-studio/images/jack_icon.sif</param>
-		<param name="exclude">synfig-studio/images/keyframe_icon.sif</param>
-		<param name="exclude">synfig-studio/images/keyframe_lock_icons.sif</param>
-		<param name="exclude">synfig-studio/images/layer_blur_blur_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_blur_motion_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_blur_radial_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_curvewarp_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_insideout_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_noise_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_skeletondeformation_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_spherize_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_stretch_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_twirl_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_distortion_warp_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_example_metaballs_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_example_simplecircle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_chromakey_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_clamp_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_colorcorrect_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_halftone2_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_halftone3_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_filter_lumakey_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_fractal_julia_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_fractal_mandelbrot_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_advanced_outline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_checkerboard_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_circle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_outline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_polygon_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_rectangle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_region_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_solidcolor_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_geometry_star_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_conical_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_curve_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_linear_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_noise_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_radial_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_gradient_spiral_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_duplicate_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_filtergroup_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_freetime_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_ghostgroup_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_group_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_plant_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_skeleton_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_sound_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_stroboscope_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_supersample_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_switch_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_text_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_timeloop_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_other_xorpattern_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_stylize_bevel_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_stylize_shade_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_transform_rotate_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_transform_scale_icon.sif</param>
-		<param name="exclude">synfig-studio/images/layer_transform_translate_icon.sif</param>
 		<param name="exclude">synfig-studio/images/layer_transform_zoom_icon.sif</param>
-		<param name="exclude">synfig-studio/images/library_icon.sif</param>
-		<param name="exclude">synfig-studio/images/logo.sif</param>
-		<param name="exclude">synfig-studio/images/meta_data_icon.sif</param>
-		<param name="exclude">synfig-studio/images/navigator_icon.sif</param>
-		<param name="exclude">synfig-studio/images/onion_skin_icon.sif</param>
-		<param name="exclude">synfig-studio/images/org.synfig.SynfigStudio.svg</param>
-		<param name="exclude">synfig-studio/images/palette_icon.sif</param>
-		<param name="exclude">synfig-studio/images/parameters_icon.sif</param>
-		<param name="exclude">synfig-studio/images/preview_options_icon.sif</param>
-		<param name="exclude">synfig-studio/images/rename_icon.sif</param>
-		<param name="exclude">synfig-studio/images/render_options_icon.sif</param>
-		<param name="exclude">synfig-studio/images/reset_colors_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_disabled_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_down_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_down_left_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_down_right_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_left_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_right_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_transparent_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_up_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_up_left_icon.sif</param>
-		<param name="exclude">synfig-studio/images/resize_up_right_icon.sif</param>
-		<param name="exclude">synfig-studio/images/select_all_child_layers_icon.sif</param>
-		<param name="exclude">synfig-studio/images/set_fill_color_icon.sif</param>
-		<param name="exclude">synfig-studio/images/set_icon.sif</param>
-		<param name="exclude">synfig-studio/images/set_outline_color_icon.sif</param>
-		<param name="exclude">synfig-studio/images/show_grid_icon.sif</param>
-		<param name="exclude">synfig-studio/images/show_guideline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/sif_icon.sif</param>
-		<param name="exclude">synfig-studio/images/snap_grid_icon.sif</param>
-		<param name="exclude">synfig-studio/images/snap_guideline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/sound_icon.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.61.07.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.61.08.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.61.09.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.62.00.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.62.01-2.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.62.01.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.62.02.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.00.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.01.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.02.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.03.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.04.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.05.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.63.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.64.0.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.64.1.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-0.64.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-1.0.1.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-1.0.2.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-1.0.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-1.0.x.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen-1.2.x.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen.sif</param>
-		<param name="exclude">synfig-studio/images/splash_screen_development.sh</param>
-		<param name="exclude">synfig-studio/images/splash_screen_development.sif.in</param>
-		<param name="exclude">synfig-studio/images/swap_colors_icon.sif</param>
-		<param name="exclude">synfig-studio/images/synfig_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tangent_merge_split_icons.sif</param>
-		<param name="exclude">synfig-studio/images/time_track_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_brush_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_circle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_cutout_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_draw_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_eyedrop_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_fill_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_gradient_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_mirror_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_normal_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_polyline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_rectangle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_rotate_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_scale_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_skeleton_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_sketch_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_smooth_move_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_spline_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_star_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_text_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_width_icon.sif</param>
-		<param name="exclude">synfig-studio/images/tool_zoom_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_angle_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_bool_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_canvas_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_color_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_gradient_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_integer_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_list_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_real_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_segment_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_splinepoint_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_string_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_time_icon.sif</param>
-		<param name="exclude">synfig-studio/images/type_vector_icon.sif</param>
-		<param name="exclude">synfig-studio/images/utils_chain_link_icons.sif</param>
-		<param name="exclude">synfig-studio/images/utils_timetrack_align_icon.sif</param>
-		<param name="exclude">synfig-studio/images/valuenode_icon.sif</param>
-		<param name="exclude">synfig-studio/images/wallpaper.sif</param>

_service:obs_scm:synfig-1.5.3.obscpio Changed