From e059a82f697520732ebc42bccbb5ecf28cff8f58 Mon Sep 17 00:00:00 2001
From: belegdol <belegdol@fedoraproject.org>
Date: Nov 01 2009 17:29:49 +0000
Subject: - 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

---

diff --git a/.cvsignore b/.cvsignore
index 84bb5af..f775604 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-subtitles-0.8.tar.gz
+gnome-subtitles-0.9.1.tar.gz
diff --git a/gnome-subtitles-0.8-smp.patch b/gnome-subtitles-0.8-smp.patch
deleted file mode 100644
index 90611c0..0000000
--- a/gnome-subtitles-0.8-smp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.am.smp	2008-07-05 17:17:53.000000000 +0200
-+++ src/Makefile.am	2008-07-05 17:18:23.000000000 +0200
-@@ -43,7 +43,7 @@
- 	$(GSTPB) \
- 	Mono.Posix.dll
- 
--$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES)
-+$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) $(GSTPB)
- 	$(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES)
- 
- $(ASSEMBLY_CONFIG):
---- src/Makefile.in.smp	2008-07-05 17:17:39.000000000 +0200
-+++ src/Makefile.in	2008-07-05 17:19:01.000000000 +0200
-@@ -485,7 +485,7 @@
- 	uninstall-info-am
- 
- 
--$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES)
-+$(ASSEMBLY): $(GS_SOURCES) $(GS_RESOURCES) $(GSTPB)
- 	$(MCS) $(MCS_FLAGS) -target:winexe -out:$(ASSEMBLY) $(GS_SYSTEM_REFERENCES:%=-r:%) $(GTKSHARP_LIBS) $(SUBLIB_LIBS) $(GS_RESOURCES:%=-resource:%) $(GS_SOURCES)
- 
- $(ASSEMBLY_CONFIG):
diff --git a/gnome-subtitles.spec b/gnome-subtitles.spec
index 068c75c..4f7de7e 100644
--- a/gnome-subtitles.spec
+++ b/gnome-subtitles.spec
@@ -1,35 +1,40 @@
 Name:           gnome-subtitles
-Version:        0.8
-Release:        9%{?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
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
+# No mono available here.
+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
@@ -38,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
@@ -77,6 +80,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 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
@@ -89,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
@@ -106,6 +111,17 @@ 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@ausil.us> - 0.8-10
+- ExcludeArch sparc64
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index c11c056..f948276 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9590389ba91f9cfd94b6b36454dc2420  gnome-subtitles-0.8.tar.gz
+1c5f01aaf14dbd91581b286bf92f08d7  gnome-subtitles-0.9.1.tar.gz