From 27865e8c1f17375f933d21101539f324b6fb4b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 11 Aug 2012 23:58:21 +0300 Subject: [PATCH] Fold emacs-* subpackages into main (#690264). --- desktop-file-utils.spec | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index a8b4b92..56f7455 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.20 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz Source1: desktop-entry-mode-init.el @@ -12,6 +12,12 @@ License: GPLv2+ Group: Development/Tools BuildRequires: glib2-devel +BuildRequires: emacs +Requires: emacs-filesystem +Provides: emacs-%{pkg} = %{version}-%{release} +Provides: emacs-%{pkg}-el = %{version}-%{release} +Obsoletes: emacs-%{pkg} < 0.20-3 +Obsoletes: emacs-%{pkg}-el < 0.20-3 %description .desktop files are used to describe an application for inclusion in @@ -21,27 +27,6 @@ http://www.freedesktop.org/standards/, and desktop-file-install which installs a desktop file to the standard directory, optionally fixing it up in the process. -%package -n emacs-%{pkg} -Summary: Compiled elisp files to run %{pkgname} under GNU Emacs -Group: Applications/Editors -BuildArch: noarch -BuildRequires: emacs -Requires: emacs(bin) >= %{_emacs_version} - -%description -n emacs-%{pkg} -%{pkgname} is an add-on package for GNU Emacs. - -%package -n emacs-%{pkg}-el -Summary: Elisp source files for %{pkgname} under GNU Emacs -Group: Applications/Editors -BuildArch: noarch -Requires: emacs-%{pkg} = %{version}-%{release} - -%description -n emacs-%{pkg}-el -This package contains the elisp source files for %{pkgname} under -GNU Emacs. You do not need to install this package to run %{pkgname}. -Install the %{name} package to use %{pkgname} with GNU Emacs. - %prep %setup -q @@ -65,17 +50,14 @@ touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc %{_mandir}/man1/desktop-file-validate.1.gz %{_mandir}/man1/update-desktop-database.1.gz %{_mandir}/man1/desktop-file-edit.1.gz - -%files -n emacs-%{pkg} %{_emacs_sitestartdir}/desktop-entry-mode-init.el %ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc -%dir %{_emacs_sitelispdir}/%{pkg} -%{_emacs_sitelispdir}/%{pkg}/*.elc - -%files -n emacs-%{pkg}-el -%{_emacs_sitelispdir}/%{pkg}/*.el +%{_emacs_sitelispdir}/%{pkg} %changelog +* Sat Aug 11 2012 Ville Skyttä - 0.20-3 +- Fold emacs-* subpackages into main (#690264). + * Wed Jul 18 2012 Fedora Release Engineering - 0.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild