rpms/gnome-subtitles/F-12 .cvsignore, 1.2, 1.3 gnome-subtitles.spec, 1.9, 1.10 sources, 1.2, 1.3 gnome-subtitles-0.8-smp.patch, 1.1, NONE

[belegdol]

Author: belegdol

Update of /cvs/pkgs/rpms/gnome-subtitles/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29114

Modified Files:
	.cvsignore gnome-subtitles.spec sources 
Removed Files:
	gnome-subtitles-0.8-smp.patch 
Log Message:
* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.1-1
- Updated to 0.9.1
- Dropped the SMP build patch
- Added desktop-database scriptlets
- Re-enabled parallel make
- Updated the License tag
- Added intltool to BuildRequires, removed explicit gettext



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	19 May 2008 19:04:29 -0000	1.2
+++ .cvsignore	1 Nov 2009 17:22:51 -0000	1.3
@@ -1 +1 @@
-gnome-subtitles-0.8.tar.gz
+gnome-subtitles-0.9.1.tar.gz


Index: gnome-subtitles.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/gnome-subtitles.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gnome-subtitles.spec	26 Oct 2009 20:47:19 -0000	1.9
+++ gnome-subtitles.spec	1 Nov 2009 17:22:51 -0000	1.10
@@ -1,29 +1,28 @@
 Name:           gnome-subtitles
-Version:        0.8
-Release:        10%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Subtitle editor for Gnome
 
 Group:          Applications/Multimedia
-License:        GPLv2+
+#Files under src/External/NCharDet are MPLv1.1 or GPLv2+ or LGPLv2+
+License:        GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:            http://gnome-subtitles.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         gnome-subtitles-0.8-smp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
 BuildRequires:  gnome-doc-utils
 BuildRequires:  gnome-sharp-devel
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  gtk-sharp2-devel
+BuildRequires:  intltool
 BuildRequires:  mono-devel
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  scrollkeeper
-BuildRequires:  sublib-devel
 
-Requires(pre): GConf2
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -31,7 +30,11 @@ Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
 # No mono available here.
-ExcludeArch: sparc64
+ExcludeArch:    sparc64
+
+#sublib is now merged with gnome-subtitles
+Obsoletes:      sublib < 0.9-7
+Obsoletes:      sublib-devel < 0.9-7
 
 %description
 Gnome Subtitles is a subtitle editor for the GNOME desktop. It supports the
@@ -40,14 +43,12 @@ translation and synchronization.
 
 %prep
 %setup -q
-%patch0 -p0 -b .smp
 
 
 %build
 %configure --disable-schemas-install \
            --disable-scrollkeeper
-# %{__make} %{?_smp_mflags}
-%{__make}
+%{__make} %{?_smp_mflags}
 
 
 %install
@@ -79,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas > /dev/null || :
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+update-desktop-database &> /dev/null || :
 
 
 %preun
@@ -91,11 +93,12 @@ fi
 
 %postun
 scrollkeeper-update -q || :
+update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING CREDITS NEWS README
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_sysconfdir}/gconf/schemas/gnome-subtitles.schemas
 %{_bindir}/gnome-subtitles
 %{_libdir}/gnome-subtitles
@@ -108,6 +111,14 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.1-1
+- Updated to 0.9.1
+- Dropped the SMP build patch
+- Added desktop-database scriptlets
+- Re-enabled parallel make
+- Updated the License tag
+- Added intltool to BuildRequires, removed explicit gettext
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.8-10
 - ExcludeArch sparc64
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-subtitles/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	19 May 2008 19:04:29 -0000	1.2
+++ sources	1 Nov 2009 17:22:51 -0000	1.3
@@ -1 +1 @@
-9590389ba91f9cfd94b6b36454dc2420  gnome-subtitles-0.8.tar.gz
+1c5f01aaf14dbd91581b286bf92f08d7  gnome-subtitles-0.9.1.tar.gz


--- gnome-subtitles-0.8-smp.patch DELETED ---