This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2004-09-07 19:24:34 UTC Artur Frysiak <artur@frysiak.net> '- strip not menu releated entries and move to menu.conf'
Cherrypick from master 2007-12-19 14:17:20 UTC Elan Ruusamäe <glen@pld-linux.org> '- package %{_desktopdir}/mimeinfo.cache; rel 2':
    desktop-file-utils.spec -> 1.38

diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index bc5aa0b10a3f41857032892e34068ba497508463..f4bf36aaf05e28cd641782b9132a030bbd6fc93c 100644 (file)
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,60 +1,30 @@
 Summary:       A couple of command line utilities for working with desktop entries
-Summary(pl):   Kilka narzêdzi do pracy z elementami biurkowymi
+Summary(pl.UTF-8):     Kilka narzędzi do pracy z elementami biurkowymi
 Name:          desktop-file-utils
-Version:       0.8
-Release:       1
+Version:       0.14
+Release:       2
 License:       GPL
 Group:         Applications
-Source0:       http://freedesktop.org/Software/desktop-file-utils/releases/%{name}-%{version}.tar.gz
-# Source0-md5: b0dc11041949eecb877f755105f6b036
-Source1:       %{name}-default-modules.conf
-Patch0:                %{name}-menu.patch
-Patch1:                %{name}-notshowin.patch
-Patch2:                %{name}-home_dir.patch
-Patch3:                %{name}-directory_onlyshowin.patch
-Patch4:                %{name}-directory_notshowin.patch
-# don't append / at end of URL
-URL:           http://www.freedesktop.org/software/desktop-file-utils
+Source0:       http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz
+# Source0-md5: e0b5057a4e3166f34635ac6f27c712c0
+URL:           http://www.freedesktop.org/wiki/Software/desktop-file-utils
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glib2-devel >= 2.0.0
-BuildRequires: gnome-vfs2-devel >= 2.2.0
+BuildRequires: glib2-devel >= 1:2.8.0
 BuildRequires: libtool
-BuildRequires: popt-devel >= 1.5
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 desktop-file-utils contains a couple of command line utilities for
 working with desktop entries.
 
-%description -l pl
-desktop-file-utils zawiera kilka narzêdzi uruchamianych z linii
-poleceñ, s³u¿±cych do pracy z elementami biurkowymi.
-
-%package -n gnome-vfs2-module-menu
-Summary:       Freedesktop.org style menu support module for gnome-vfs
-Summary(pl):   Obs³uga menu wed³ug specyfikacji z freedesktop.org
-Group:         Applications
-Provides:      gnome-vfs-menu-module
-Obsoletes:     gnome-vfs2-vfolder-menu
-Requires:      gnome-vfs2 >= 2.6.1.1-3.1
-Requires:      applnk >= 1.9.4
-
-%description -n gnome-vfs2-module-menu
-This package contains module for gnome-vfs supporting menu with
-specification declared by freedesktop.org .
-
-%description -n gnome-vfs2-module-menu -l pl
-Ten pakiet zawiera modu³ obs³ugi menu dla gnome-vfs wed³ug
-specyfikacji freedesktop.org .
+%description -l pl.UTF-8
+desktop-file-utils zawiera kilka narzędzi uruchamianych z linii
+poleceń, służących do pracy z elementami biurkowymi.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -72,13 +42,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# remove unused *.la for gnome-vfs modules
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/*.la
-
-# not needed - it's only for testing purposes
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/menu-modules.conf
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf
+install -d $RPM_BUILD_ROOT%{_desktopdir}
+touch $RPM_BUILD_ROOT%{_desktopdir}/mimeinfo.cache
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,8 +52,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-
-%files -n gnome-vfs2-module-menu
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gnome-vfs-2.0/modules/*.so
-%{_sysconfdir}/gnome-vfs-2.0/modules/default-modules.conf
+%ghost %{_desktopdir}/mimeinfo.cache