rpms/openshot/F-14 openshot-1.3.0-doc-install.diff, NONE, 1.1 openshot-1.3.0-use_mlt-melt.diff, NONE, 1.1 openshot.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/openshot/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9268/F-14

Modified Files:
	.cvsignore sources 
Added Files:
	openshot-1.3.0-doc-install.diff 
	openshot-1.3.0-use_mlt-melt.diff openshot.spec 
Log Message:
Import for initial release.


openshot-1.3.0-doc-install.diff:
 setup.py |   27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

--- NEW FILE openshot-1.3.0-doc-install.diff ---
--- openshot-1.3.0-orig/setup.py	2011-02-04 14:07:09.000000000 -0600
+++ openshot-1.3.0/setup.py	2011-02-14 14:49:17.835220961 -0600
@@ -52,6 +52,31 @@ for filepath in glob.glob("openshot/loca
 	filepath = filepath.replace('openshot/', '')
 	locale_files.append(filepath)
 
+# Add the help files
+help_files = []
+for path in glob.glob(os.path.join('docs', 'gnome', '*')):
+    lang = os.path.basename(path)
+    if lang == 'figures':
+        continue
+    path_xml = os.path.join('share', 'gnome', 'help', 'openshot', lang)
+    help_files.append((path_xml, glob.glob('%s/*.xml' % path)))
+
+# figures are not locale-specific
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'effects', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'effects')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'transitions', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'transitions')
+help_files.append((figures_path, figures))
+
+# OMFs are in a different directory
+omfs = glob.glob(os.path.join('docs', 'omf', '*.omf'))
+omf_path = os.path.join('share', 'omf', 'openshot')
+help_files.append((omf_path, omfs))
+
 # Call the main Distutils setup command
 # -------------------------------------
 dist = setup(
@@ -62,7 +87,7 @@ dist = setup(
 	 				'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
 	 				'openshot.uploads' : ['logos/*.png'],
 	 				},
-	 data_files = os_files,
+	 data_files = os_files + help_files,
 	 **info.SETUP
 )
 # -------------------------------------

openshot-1.3.0-use_mlt-melt.diff:
 classes/av_formats.py  |    2 +-
 windows/preferences.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openshot-1.3.0-use_mlt-melt.diff ---
diff -upr openshot-1.3.0-orig/openshot/classes/av_formats.py openshot-1.3.0/openshot/classes/av_formats.py
--- openshot-1.3.0-orig/openshot/classes/av_formats.py	2011-01-29 13:58:49.000000000 -0600
+++ openshot-1.3.0/openshot/classes/av_formats.py	2011-02-14 14:45:31.313113270 -0600
@@ -36,7 +36,7 @@ from language import Language_Init
 
 class formats:
 	
-	def __init__(self, melt_command="melt"):
+	def __init__(self, melt_command="mlt-melt"):
 		# init melt command
 		self.melt_command = melt_command
 		
diff -upr openshot-1.3.0-orig/openshot/windows/preferences.py openshot-1.3.0/openshot/windows/preferences.py
--- openshot-1.3.0-orig/openshot/windows/preferences.py	2011-01-29 22:13:46.000000000 -0600
+++ openshot-1.3.0/openshot/windows/preferences.py	2011-02-14 14:46:33.354416506 -0600
@@ -329,7 +329,7 @@ class Settings:
 		"default_profile" : "DV NTSC",
 		"project_file_type" : "ascii",
 		"max_history_size" : "20",
-		"melt_command" : "melt",
+		"melt_command" : "mlt-melt",
 		"blender_command" : "blender",
 		"output_mode" : "sdl",
 		"use_stock_icons" : "Yes",
 # -------------------------------------


--- NEW FILE openshot.spec ---
Name:           openshot
Version:        1.3.0
Release:        3%{?dist}
Summary:        A GTK based non-linear video editor 

Group:          Applications/Multimedia
# All files are GPLv3+ except for files under openshot/uploads/youtube which
# are ASL 2.0 and openshot/window/SimpleGtkBuilderApp.py which is LGPLv3 making
# the effective license of openshot GPLv3.
License:        GPLv3
URL:            http://www.openshotvideo.com/

Source0:        http://launchpad.net/openshot/1.3/%{version}/+download/openshot-%{version}.tar.gz
Patch0:         %{name}-%{version}-use_mlt-melt.diff
Patch1:         %{name}-%{version}-doc-install.diff

BuildArch: noarch

#BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: python2-devel

Requires:      mlt
Requires:      mlt-python
Requires:      notify-python
Requires:      pygoocanvas
Requires:      pygtk2-libglade
Requires:      python(abi) >= 2.5
Requires:      python-imaging
Requires:      pyxdg
Requires:      SDL
Requires:      sox
#Requires:      librsvg2
Requires:      frei0r-plugins


%description
OpenShot Video Editor is a free, open-source, non-linear video editor, based on
Python, GTK, and MLT. It can edit video and audio files, composite and 
transition video files, and mix multiple layers of video and audio together and 
render the output in many different formats.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Don't install unnecessary stuff
sed -i -e '/lib\/mime\/packages/d' setup.py

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT 

# Remove unnecessary .po files
rm %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.po
rm %{buildroot}%{python_sitelib}/%{name}/locale/OpenShot/OpenShot.pot
rm %{buildroot}%{python_sitelib}/%{name}/locale/README

# We strip bad shebangs (/usr/bin/env) instead of fixing them
# since these files are not executable anyways
find %{buildroot}/%{python_sitelib} -name '*.py' \
  -exec grep -q '^#!' '{}' \; -print | while read F
do
  awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped
  touch -r $F chopped
  mv chopped $F
done

# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop

# modify find-lang.sh to deal with gettext .mo files under
# openshot/locale
%{__sed} -e 's|/share/locale/|/%{name}/locale/|' \
 /usr/lib/rpm/find-lang.sh \
 > find-lang-modified.sh

sh find-lang-modified.sh %{buildroot} OpenShot %{name}.lang
find %{buildroot}%{python_sitelib}/%{name}/locale -type d | while read dir
do
 echo "%%dir ${dir#%{buildroot}}" >> %{name}.lang
done


%clean
rm -rf %{buildroot}

%post
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%postun
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_datadir}/gnome/help/openshot/
%{_datadir}/omf/openshot/
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py*
%{python_sitelib}/%{name}/blender
%{python_sitelib}/%{name}/classes
%{python_sitelib}/%{name}/effects
%{python_sitelib}/%{name}/export_presets
%{python_sitelib}/%{name}/images
%{python_sitelib}/%{name}/language
%{python_sitelib}/%{name}/profiles
%{python_sitelib}/%{name}/themes
%{python_sitelib}/%{name}/titles
%{python_sitelib}/%{name}/transitions
%{python_sitelib}/%{name}/uploads
%{python_sitelib}/%{name}/windows
%{python_sitelib}/*egg-info
%{_mandir}/man*/* 


%changelog
* Sun Apr 10 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.3.0-2
- Fixed spec file for packaging guidelines compliance.

* Mon Feb 14 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.3.0-1
- Release 1.3.0

* Thu Oct 11 2010 Elliott Sales de Andrade <quantum.analyst at gmail.com> - 1.2.2-1
- Release 1.2.2

* Tue Jun 22 2010 Renich Bon Ćirić <renich at woralelandia.com> - 1.1.3-1
- Release 1.1.3

* Tue Jan 12 2010 Zarko <zarko.pintar at gmail.com> - 1.0.0-1
- Release 1.0.0

* Thu Dec 04 2009 Zarko <zarko.pintar at gmail.com> - 0.9.54-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openshot/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2011 10:51:56 -0000	1.1
+++ .cvsignore	12 Apr 2011 14:14:39 -0000	1.2
@@ -0,0 +1 @@
+openshot-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openshot/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2011 10:51:56 -0000	1.1
+++ sources	12 Apr 2011 14:14:39 -0000	1.2
@@ -0,0 +1 @@
+c44a09af0874a1612ed0693f8e369172  openshot-1.3.0.tar.gz