rpms/monodevelop/devel monodevelop.spec,1.28,1.29

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/monodevelop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv471/devel

Modified Files:
	monodevelop.spec 
Log Message:
fix conditional comparison


Index: monodevelop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodevelop/devel/monodevelop.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- monodevelop.spec	30 Apr 2008 12:03:25 -0000	1.28
+++ monodevelop.spec	7 Jul 2008 19:12:01 -0000	1.29
@@ -8,7 +8,7 @@
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 1.0
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
@@ -18,18 +18,19 @@
 Patch2: monodevelop-0.19-use-system-Mono.Cecil.patch
 Patch3: mdtool.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel
+BuildRequires: mono-devel, gtk-sharp2-devel, intltool, gettext-devel, bytefx-data-mysql, mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview2-sharp-devel, monodoc-devel, subversion-devel desktop-file-utils,boo-devel
 BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel mono-core
-BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview-sharp-devel
+BuildRequires: autoconf libtool automake mono-nunit-devel mono-nunit22-devel mono-nunit mono-basic-devel gtksourceview2-sharp-devel mono-tools-devel
 %ifarch !ppc
 BuildRequires: boo-devel
 Requires: boo
 %endif
-%if "%{?fedora}" > "8"
+%if 0%{?fedora} > 8
 BuildRequires: mono-addins-devel
 Requires: mono-addins
 %endif
 Requires: mono-core, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-data-postgresql mono-data-sybase mono-data-oracle, mono-nunit, apr, gtk-sharp2-gapi, gnome-sharp, firefox > 1.99, xsp, subversion, mono-data-sqlite
+Requires: mono-tools
 # ikvm doesn't build from source at the moment. If it does at some point in the future, uncomment this line.
 # Requires: ikvm
 
@@ -78,7 +79,7 @@
 cp %{_libdir}/mono/nunit22/nunit.framework.dll src/addins/NUnit/lib/
 
 %build
-%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2
+%configure --enable-boo --enable-java --enable-nemerle --enable-versioncontrol --prefix=%{_prefix} --libdir=%{_libdir} --enable-gnomeplatform --enable-c --enable-gtksourceview2 
 make
 # no smp flags as it falls over during the build (race condition)
 
@@ -92,6 +93,17 @@
         --delete-original \
         %{buildroot}%{_datadir}/applications/monodevelop.desktop
 
+#remove package mime caches
+%{__rm} -f %{buildroot}%{_datadir}/mime/XMLnamespaces
+%{__rm} -f %{buildroot}%{_datadir}/mime/aliases
+%{__rm} -f %{buildroot}%{_datadir}/mime/application/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/text/*
+%{__rm} -f %{buildroot}%{_datadir}/mime/globs
+%{__rm} -f %{buildroot}%{_datadir}/mime/magic
+%{__rm} -f %{buildroot}%{_datadir}/mime/subclasses
+%{__rm} -f %{buildroot}%{_datadir}/mime/mime.cache
+%{__rm} -f %{buildroot}%{_datadir}/applications/mimeinfo.cache
+
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
 update-desktop-database &> /dev/null || :
@@ -106,15 +118,7 @@
 %{_bindir}/monodevelop
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/monodevelop/
-%exclude %{_datadir}/mime/XMLnamespaces
-%exclude %{_datadir}/mime/aliases
-%{_datadir}/mime/globs
-%{_datadir}/mime/magic
-%{_datadir}/mime/mime.cache
 %{_datadir}/mime/packages/monodevelop.xml
-%{_datadir}/mime/application/*.xml
-%exclude %{_datadir}/mime/subclasses
-%{_datadir}/mime/text/x-*.xml
 %{_datadir}/applications/fedora-monodevelop.desktop
 %{_datadir}/man/man1/mdtool.1.gz
 %{_datadir}/man/man1/monodevelop.1.gz
@@ -133,6 +137,17 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-7
+- fix conditional comparison
+
+* Tue May 06 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-6
+- added br mono-tools
+- removed prepackaged mime
+
+* Thu May 01 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-5.1
+- attempt a fix for a text editor to work
+- rebuild
+
 * Wed Apr 30 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.0-4
 - mdtool fix