rpms/desktop-file-utils/devel desktop-file.prov, NONE, 1.1 desktop-file-utils.spec, 1.51, 1.52 desktop_mime_type.prov, 1.1, NONE macros.desktop_mime_type, 1.1, NONE

Richard Hughes rhughes at fedoraproject.org
Wed Feb 4 18:01:52 UTC 2009


Author: rhughes

Update of /cvs/pkgs/rpms/desktop-file-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30342

Modified Files:
	desktop-file-utils.spec 
Added Files:
	desktop-file.prov 
Removed Files:
	desktop_mime_type.prov macros.desktop_mime_type 
Log Message:
* Wed Feb 04 2009 Richard Hughes <rhughes at redhat.com> - 0.15-5
- Panu merged the rpm bits for this feature, but we've got a new provides
  filename. Respin this package with the new name.



--- NEW FILE desktop-file.prov ---
#!/bin/sh
#
# Script to install in:
# /usr/lib/rpm/redhat/find-provides.d
#
# Transform desktop mimetype info into RPM provides
#
# Author: Richard Hughes <richard at hughsie.com>
# Based on other provides scripts from RPM
#

#!/bin/sh
OLD_IFS="$IFS"
while read instfile ; do
	case "$instfile" in
	*.desktop)
		mime=`cat $instfile | grep MimeType | cut -d'=' -f2`
                IFS=';'
		for type in $mime ; do
		        echo 'mimetype('$type')'
	        done
		;;
	esac
done
IFS=$OLD_IFS



Index: desktop-file-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- desktop-file-utils.spec	22 Jan 2009 17:45:36 -0000	1.51
+++ desktop-file-utils.spec	4 Feb 2009 18:01:21 -0000	1.52
@@ -1,11 +1,10 @@
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.15
-Release: 3%{?dist}
+Release: 5%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz
-Source1: desktop_mime_type.prov
-Source2: macros.desktop_mime_type
+Source1: desktop-file.prov
 # https://bugs.freedesktop.org/show_bug.cgi?id=12018
 License: GPLv2+
 Group: Development/Tools
@@ -34,8 +33,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # add the provides script
-install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop_mime_type.prov
-install -m0755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.desktop_mime_type
+install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop-file.prov
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,10 +43,13 @@
 %doc AUTHORS COPYING README NEWS
 %{_bindir}/*
 %{_datadir}/emacs/site-lisp/
-%{_libdir}/rpm/desktop_mime_type.prov
-%{_sysconfdir}/rpm/macros.desktop_mime_type
+%{_libdir}/rpm/desktop-file.prov
 
 %changelog
+* Wed Feb 04 2009 Richard Hughes <rhughes at redhat.com> - 0.15-5
+- Panu merged the rpm bits for this feature, but we've got a new provides
+  filename. Respin this package with the new name.
+
 * Thu Jan 22 2009 Richard Hughes <rhughes at redhat.com> - 0.15-4
 - Rename desktop-mime-type.prov to desktop_mime_type.prov and add the tiny
   macros.desktop_mime_type file so that we can trivially patch rpm to enable


--- desktop_mime_type.prov DELETED ---


--- macros.desktop_mime_type DELETED ---




More information about the scm-commits mailing list