Author: hobbes1069 Update of /cvs/free/rpms/openshot/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29967 Modified Files: branch openshot.spec sources Removed Files: openshot-1.3.0-doc-install.diff openshot-1.3.0-use_mlt-melt.diff Log Message: * Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.4.2-2 - Update to latest release. - Fixed small build problem with the buildroot path finding it's way into a packaged file. Index: branch =================================================================== RCS file: /cvs/free/rpms/openshot/F-15/branch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branch 24 May 2011 20:41:13 -0000 1.1 +++ branch 6 Feb 2012 16:49:39 -0000 1.2 @@ -1 +1 @@ -F-15 +F-16 Index: openshot.spec =================================================================== RCS file: /cvs/free/rpms/openshot/F-15/openshot.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openshot.spec 25 Sep 2011 17:58:53 -0000 1.4 +++ openshot.spec 6 Feb 2012 16:49:39 -0000 1.5 @@ -1,6 +1,6 @@ Name: openshot -Version: 1.4.0 -Release: 1%{?dist} +Version: 1.4.2 +Release: 2%{?dist} Summary: A GTK based non-linear video editor Group: Applications/Multimedia @@ -18,7 +18,9 @@ #BuildRequires: gettext BuildRequires: desktop-file-utils -BuildRequires: python2-devel +BuildRequires: python-devel +# Resize icon +BuildRequires: ImageMagick Requires: mlt Requires: mlt-python @@ -34,6 +36,8 @@ Requires: librsvg2 Requires: frei0r-plugins Requires: fontconfig +# Needed because it owns icon directories +Requires: hicolor-icon-theme %description @@ -56,7 +60,7 @@ %install -%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root=%{buildroot} # Remove unnecessary .po files rm %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.po @@ -76,6 +80,15 @@ # Validate desktop file desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +# Move icon files to the preferred location +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +mv %{buildroot}%{_datadir}/pixmaps/%{name}.svg \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +convert -resize 48x48 -strip \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png + # modify find-lang.sh to deal with gettext .mo files under # openshot/locale %{__sed} -e 's|/share/locale/|/%{name}/locale/|' \ @@ -105,7 +118,7 @@ %{_datadir}/omf/openshot/ %{_bindir}/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/* +%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/mime/packages/* %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* @@ -126,12 +139,17 @@ %changelog +* Mon Feb 06 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.4.2-2 +- Update to latest release. +- Fixed small build problem with the buildroot path finding it's way into + a packaged file. + +* Mon Jan 30 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.4.1-1 +- Update to latest release. + * Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.4.0-1 - New release. -* Tue May 31 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.3.1-1 -- Update to latest release: 1.3.1 - * Sun Apr 10 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.3.0-2 - Fixed spec file for packaging guidelines compliance. Index: sources =================================================================== RCS file: /cvs/free/rpms/openshot/F-15/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 25 Sep 2011 17:58:53 -0000 1.4 +++ sources 6 Feb 2012 16:49:39 -0000 1.5 @@ -1 +1 @@ -3061a49af6d1cbd9b1558b9f2b0ba8e2 openshot-1.4.0.tar.gz +16fea75be6b1fc9d31c6a30a81f85a38 openshot-1.4.2.tar.gz --- openshot-1.3.0-doc-install.diff DELETED --- --- openshot-1.3.0-use_mlt-melt.diff DELETED ---