- drop some rm -f cruft
- don't call update-desktop-database from %post or %postun
This commit is contained in:
parent
b39b2cc6e9
commit
22e005a6c2
@ -1,15 +1,14 @@
|
|||||||
Summary: Utilities for manipulating .desktop files
|
Summary: Utilities for manipulating .desktop files
|
||||||
Name: desktop-file-utils
|
Name: desktop-file-utils
|
||||||
Version: 0.12
|
Version: 0.12
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
URL: http://www.freedesktop.org/software/desktop-file-utils
|
URL: http://www.freedesktop.org/software/desktop-file-utils
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
BuildRoot: %{_tmppath}/%{name}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= 2.12.0
|
BuildRequires: glib2-devel >= 2.12.0
|
||||||
BuildRequires: emacs
|
|
||||||
|
|
||||||
Obsoletes: desktop-file-validator
|
Obsoletes: desktop-file-validator
|
||||||
|
|
||||||
@ -28,7 +27,6 @@ fixing it up in the process.
|
|||||||
%patch0 -p1 -b .make-vendor-optional
|
%patch0 -p1 -b .make-vendor-optional
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%configure
|
%configure
|
||||||
make
|
make
|
||||||
|
|
||||||
@ -36,18 +34,12 @@ make
|
|||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
# We don't want the vfs module yet
|
|
||||||
/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libmenu*
|
|
||||||
/bin/rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnome-vfs-2.0/modules/menu-modules.conf
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%post
|
%post
|
||||||
update-desktop-database %{_datadir}/applications || :
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
update-desktop-database %{_datadir}/applications || :
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -55,6 +47,10 @@ update-desktop-database %{_datadir}/applications || :
|
|||||||
%{_datadir}/emacs/site-lisp/
|
%{_datadir}/emacs/site-lisp/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-3
|
||||||
|
- drop some rm -f cruft
|
||||||
|
- don't call update-desktop-database from %%post or %%postun
|
||||||
|
|
||||||
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-2
|
* Tue Nov 28 2006 Ray Strode <rstrode@redhat.com> - 0.12-2
|
||||||
- make --vendor optional
|
- make --vendor optional
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user