rpms/blender/devel blender.spec, 1.3, 1.4 gnome-mime-application-x-blender.png, 1.1, NONE x-blender.desktop, 1.1, NONE

[Phillip Compton (pcompton)]

Changeset from: pcompton

Update of /cvs/extras/rpms/blender/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10371

Modified Files:
	blender.spec 
Removed Files:
	gnome-mime-application-x-blender.png x-blender.desktop 
Log Message:
Redirect output in post/postun. Remove old files from mime system.



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blender.spec	11 Nov 2004 05:58:54 -0000	1.3
+++ blender.spec	11 Nov 2004 22:30:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.34
-Release:        0.fdr.3
+Release:        0.fdr.4
 Summary:        3D modeling, animation, rendering and post-production.
 
 Group: 	        Applications/Multimedia
@@ -11,9 +11,7 @@
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:	blender.png
 Source4: 	blender.desktop
-Source5:        gnome-mime-application-x-blender.png
-Source6:	x-blender.desktop
-Source7:        blender.xml
+Source5:        blender.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -61,9 +59,7 @@
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/import-3ds-0.7.py
 install -p -D -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/blender/scripts/export-3ds-0.71.py
 install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
-install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gnome-mime-application-x-blender.png
-install -p -D -m0644 %{SOURCE6} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-blender.desktop
-install -p -D -m0644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
+install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora                               \
@@ -76,12 +72,12 @@
 
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
-update-desktop-database %{_datadir}/applications
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
-update-desktop-database %{_datadir}/applications
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files
@@ -91,11 +87,14 @@
 %{_datadir}/applications/fedora-blender.desktop
 %{_datadir}/pixmaps/*.png
 %{_datadir}/blender/
-%{_datadir}/mimelnk/application/*
 %{_datadir}/mime/packages/blender.xml
 
 
 %changelog
+* Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> 2.34-0.fdr.4
+- Redirect output in post/postun, to avoid failure.
+- Dropped other unnecessary files from old mime system.
+
 * Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> 2.34-0.fdr.3
 - Mime-type corrections for FC3.
 - Dropped redundent BR XFree86-devel.


--- x-blender.desktop DELETED ---