rpms/pitivi/devel .cvsignore, 1.19, 1.20 pitivi.spec, 1.42, 1.43 sources, 1.19, 1.20

[Jeffrey C. Ollie]

Author: jcollie

Update of /cvs/pkgs/rpms/pitivi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7721

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.2.837f0d73
- Update to git master to see if this fixes anyone's problems
- Call update-desktop-database/update-mime-database in post/postun



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	16 Sep 2009 03:10:35 -0000	1.19
+++ .cvsignore	11 Dec 2009 14:20:02 -0000	1.20
@@ -1 +1,2 @@
-pitivi-0.13.3.tar.bz2
+pitivi-0.13.3-837f0d7.tar.bz2
+common-888e0a26.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- pitivi.spec	3 Dec 2009 23:13:59 -0000	1.42
+++ pitivi.spec	11 Dec 2009 14:20:02 -0000	1.43
@@ -1,14 +1,33 @@
+%define pitivi_git	837f0d73
+%define common_git	888e0a26
 %define major   0.13
 %define minor   3
 Name:           pitivi
 Version:        %{major}.%{minor}
-Release:        3%{?dist}
+Release:        3.2.%{pitivi_git}%{?dist}
 Summary:        Non-linear video editor
 
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://www.pitivi.org/
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}.tar.bz2
+
+#Source0:        http://ftp.gnome.org/pub/GNOME/sources/pitivi/%{major}/pitivi-%{version}-%{pitivi_git}.tar.bz2
+
+
+# To generate the source tarballs:
+#
+# git clone git://git.pitivi.org/git/pitivi.git
+# cd pitivi
+# pitivi_git=`git show-ref --hash=8 HEAD`
+# git archive --format=tar --prefix=pitivi-0.13.3-${pitivi_git}/ ${pitivi_git} | bzip2 > pitivi-0.13.3-${pitivi_git}.tar.bz2
+# git submodule init
+# git submodule update
+# common_git=`git submodule status common | awk '{print substr($1,1,8)}'`
+# cd common
+# git archive --format=tar --prefix=common/ ${common_git} | bzip2 > ../common-${common_git}.tar.bz2
+
+Source0:        pitivi-%{version}-%{pitivi_git}.tar.bz2
+Source1:	common-%{common_git}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -33,7 +52,7 @@ At this level of development it can be c
 program. 
 
 %prep
-%setup0 -q
+%setup0 -q -n %{name}-%{version}-%{pitivi_git} -a 1
 
 for f in `find . -name \*.py`
 do
@@ -41,6 +60,8 @@ do
 done
 
 %build
+./autogen.sh
+
 %configure --libdir=%{_datadir}
 
 make %{?_smp_mflags}
@@ -58,6 +79,14 @@ desktop-file-install --vendor fedora    
 %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 ChangeLog COPYING NEWS
@@ -68,6 +97,10 @@ rm -rf %{buildroot}
 %{_datadir}/mime/packages/pitivi.xml
 
 %changelog
+* Thu Dec 10 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3.2.837f0d73
+- Update to git master to see if this fixes anyone's problems
+- Call update-desktop-database/update-mime-database in post/postun
+
 * Thu Dec  3 2009 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.13.3-3
 - Add Req on python-setuptools for BZ#540192
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pitivi/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	16 Sep 2009 03:10:36 -0000	1.19
+++ sources	11 Dec 2009 14:20:02 -0000	1.20
@@ -1 +1,2 @@
-ef9385f74173ddeb5bb10389c46d442a  pitivi-0.13.3.tar.bz2
+f27d71f12f0cf0c2abf8e5eeda9d0c40  pitivi-0.13.3-837f0d7.tar.bz2
+cb52781416d89653b9168f24fa2f9ca0  common-888e0a26.tar.bz2