Author: hobbes1069 Update of /cvs/free/rpms/avidemux/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29185 Modified Files: avidemux.spec Log Message: * Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-6 - Obsolete useless devel subpackage which has multilib issues. Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-15/avidemux.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- avidemux.spec 8 Aug 2011 19:01:17 -0000 1.55 +++ avidemux.spec 23 Sep 2011 19:17:00 -0000 1.56 @@ -2,7 +2,7 @@ Name: avidemux Version: 2.5.5 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -45,6 +45,7 @@ Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-gui = %{version} Requires: %{name}-plugins = %{version} +Obsoletes: %{name}-devel # Compiling BuildRequires: cmake @@ -149,14 +150,6 @@ %description qt This package contains the Qt graphical interface for %{name}. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} - -%description devel -This package contains files required to develop with or extend %{name}. - %prep %setup -q -n %{name}_%{version} @@ -227,16 +220,11 @@ %install -rm -rf %{buildroot} - make -C build install DESTDIR=%{buildroot} make -C build_plugins install DESTDIR=%{buildroot} -# Install the build configuration for devel package -install -d -m755 %{buildroot}%{_includedir} -install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h install -d -m755 %{buildroot}%{_datadir}/pixmaps -install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png +install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png # Find and remove all la files find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' @@ -266,9 +254,6 @@ # Gettext-style translations %find_lang %{name} -%clean -rm -rf %{buildroot} - %post libs -p /sbin/ldconfig @@ -291,14 +276,12 @@ %exclude %{_libdir}/ADM_plugins/videoFilter/*gtk.so %exclude %{_libdir}/ADM_plugins/videoFilter/*qt4.so - %files cli %{_bindir}/avidemux2_cli %{_libdir}/libADM_UICli.so %{_libdir}/libADM_render_cli.so %{_libdir}/ADM_plugins/videoFilter/*cli.so - %files gtk -f %{name}.lang %{_bindir}/avidemux2_gtk %{_libdir}/libADM_UIGtk.so @@ -318,11 +301,11 @@ %{_datadir}/applications/*qt*.desktop %dir %{_datadir}/%{name}/i18n -%files devel -%{_includedir}/ADM_coreConfig.h - %changelog +* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-6 +- Obsolete useless devel subpackage which has multilib issues. + * Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-4 - Moved UI specific libraries and plugins to their respective sub-package to prevent unneeded dependencies from being installed.