rpms/openshot/F-15 openshot-1.4.0-doc-install.diff, NONE, 1.1 openshot-1.4.0-use_mlt-melt.diff, NONE, 1.1 openshot.spec, 1.3, 1.4 sources, 1.3, 1.4

[Richard Shaw]

Author: hobbes1069

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

Modified Files:
	openshot.spec sources 
Added Files:
	openshot-1.4.0-doc-install.diff 
	openshot-1.4.0-use_mlt-melt.diff 
Log Message:
* Fri Sep 23 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.4.0-1
- New release.


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

--- NEW FILE openshot-1.4.0-doc-install.diff ---
diff -Naur openshot-1.4beta2.orig/setup.py openshot-1.4beta2/setup.py
--- openshot-1.4beta2.orig/setup.py	2011-09-21 16:22:26.012332050 -0500
+++ openshot-1.4beta2/setup.py	2011-09-21 16:22:58.805224968 -0500
@@ -53,6 +53,31 @@
 	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(
@@ -63,7 +88,7 @@
 	 				'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
 	 				'openshot.uploads' : ['logos/*.png'],
 	 				},
-	 data_files = os_files,
+	 data_files = os_files + help_files,
 	 **info.SETUP
 )
 # -------------------------------------

openshot-1.4.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.4.0-use_mlt-melt.diff ---
diff -Naur openshot-1.4.0.orig/openshot/classes/av_formats.py openshot-1.4.0/openshot/classes/av_formats.py
--- openshot-1.4.0.orig/openshot/classes/av_formats.py	2011-09-15 21:19:01.000000000 -0500
+++ openshot-1.4.0/openshot/classes/av_formats.py	2011-09-23 09:14:16.357445808 -0500
@@ -32,7 +32,7 @@
 
 class formats:
 	
-	def __init__(self, melt_command="melt"):
+	def __init__(self, melt_command="mlt-melt"):
 		# init melt command
 		self.melt_command = melt_command
 		
diff -Naur openshot-1.4.0.orig/openshot/windows/preferences.py openshot-1.4.0/openshot/windows/preferences.py
--- openshot-1.4.0.orig/openshot/windows/preferences.py	2011-09-22 18:12:01.000000000 -0500
+++ openshot-1.4.0/openshot/windows/preferences.py	2011-09-23 09:14:16.357445808 -0500
@@ -358,7 +358,7 @@
 		"default_profile" : "DV/DVD 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",


Index: openshot.spec
===================================================================
RCS file: /cvs/free/rpms/openshot/F-15/openshot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openshot.spec	7 Jun 2011 21:07:42 -0000	1.3
+++ openshot.spec	25 Sep 2011 17:58:53 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           openshot
-Version:        1.3.1
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        A GTK based non-linear video editor 
 
 Group:          Applications/Multimedia
@@ -10,9 +10,9 @@
 License:        GPLv3
 URL:            http://www.openshotvideo.com/
 
-Source0:        http://launchpad.net/openshot/1.3/%{version}/+download/openshot-%{version}.tar.gz
-Patch0:         %{name}-1.3.0-use_mlt-melt.diff
-Patch1:         %{name}-1.3.0-doc-install.diff
+Source0:        http://launchpad.net/openshot/1.4/%{version}/+download/openshot-%{version}.tar.gz
+Patch0:         openshot-1.4.0-use_mlt-melt.diff
+Patch1:         openshot-1.4.0-doc-install.diff
 
 BuildArch: noarch
 
@@ -31,8 +31,9 @@
 Requires:      pyxdg
 Requires:      SDL
 Requires:      sox
-#Requires:      librsvg2
+Requires:      librsvg2
 Requires:      frei0r-plugins
+Requires:      fontconfig
 
 
 %description
@@ -49,11 +50,12 @@
 # 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
@@ -87,9 +89,6 @@
 done
 
 
-%clean
-rm -rf %{buildroot}
-
 %post
 update-desktop-database &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -101,7 +100,6 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_datadir}/gnome/help/openshot/
 %{_datadir}/omf/openshot/
@@ -128,7 +126,10 @@
 
 
 %changelog
-* Tue May 31 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.3.1-2
+* Fri Sep 23 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.4.0-1
+- New release.
+
+* Tue May 31 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.3.1-1
 - Update to latest release: 1.3.1
 
 * Sun Apr 10 2011 Richard Shaw <hobbes1069 at gmail.com> - 1.3.0-2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openshot/F-15/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 May 2011 16:15:45 -0000	1.3
+++ sources	25 Sep 2011 17:58:53 -0000	1.4
@@ -1 +1 @@
-8feb9f9745ea155980558547e124cc3c  openshot-1.3.1.tar.gz
+3061a49af6d1cbd9b1558b9f2b0ba8e2  openshot-1.4.0.tar.gz