rpms/shared-mime-info/devel shared-mime-info.spec,1.75,1.76

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/shared-mime-info/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13171

Modified Files:
	shared-mime-info.spec 
Log Message:
* Mon Dec 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-6
- Update with comments from Orcan Ogetbil <orcanbahri at yahoo.com>



Index: shared-mime-info.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shared-mime-info/devel/shared-mime-info.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- shared-mime-info.spec	26 Nov 2008 19:58:46 -0000	1.75
+++ shared-mime-info.spec	15 Dec 2008 13:03:25 -0000	1.76
@@ -1,11 +1,11 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.51
-Release: 5%{?dist}
-License: GPL+
-Group: System Environment/Libraries
+Release: 6%{?dist}
+License: GPLv2+
+Group: System Environment/Base
 URL: http://freedesktop.org/Software/shared-mime-info
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.bz2
 Source1: defaults.list
 # Generated with:
 # for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q $i ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi  ; done
@@ -14,14 +14,13 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=459365
 Patch0: shared-mime-info-picturecd.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  gawk
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gettext
 # For intltool:
-BuildRequires: perl-XML-Parser >= 2.31-16 intltool
-Requires: libxml2 glib2
+BuildRequires: perl(XML::Parser) intltool
+Requires: pkgconfig
 
 %description
 This is the freedesktop.org shared MIME info database.
@@ -38,28 +37,30 @@
 %build
 
 %configure --disable-update-mimedb
-make
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
 
-## remove these bogus files
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
+## remove bogus translation files
+## translations are already in the xml file installed
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*
 
-%post 
+%post
+# Should fail, as it would mean a problem in the mime database
 %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS shared-mime-info-spec.xml
+%doc README NEWS HACKING COPYING shared-mime-info-spec.xml
 %{_bindir}/*
 %dir %{_datadir}/mime/
 %{_datadir}/mime/packages
@@ -68,6 +69,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Dec 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.51-6
+- Update with comments from Orcan Ogetbil <orcanbahri at yahoo.com>
+
 * Wed Nov 26 2008 - Julian Sikorski <belegdol[at]gmail[dot]com> - 0.51-5
 - Fix text/plain, gedit installs gedit.desktop and not gnome-gedit.desktop