From 98b703213a16f6232e84f58356796f959245b0c9 Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Wed, 12 Dec 2018 17:44:51 +0000 Subject: [PATCH 1/2] Obsolete emacs-el subpackage (#1234562) --- cdargs.spec | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/cdargs.spec b/cdargs.spec index 6ee1dfe..1cabf5d 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -2,7 +2,7 @@ Name: cdargs Version: 1.35 -Release: 19%{?dist} +Release: 20%{?dist} Summary: The shell cd with bookmarks and browser License: GPLv2+ URL: http://www.skamphausen.de/cgi-bin/ska/CDargs/ @@ -38,6 +38,9 @@ BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: emacs(bin) >= %{_emacs_version} +Provides: emacs-%{name}-el = %{version}-%{release} +Obsoletes: emacs-%{name}-el < 1.35-20 + %description -n emacs-cdargs This is an Emacs front-end to cdargs. It provides a function (cv or cdargs) which uses the same bookmarks list as the terminal program @@ -45,19 +48,6 @@ cdargs and lets the user quickly make a directory listed there the current working directory. -%package -n emacs-cdargs-el -Summary: Elisp source files for Cdargs support for Emacs -Group: Applications/Editors -BuildArch: noarch - -Requires: emacs-%{name} = %{version}-%{release} - -%description -n emacs-cdargs-el -This package contains the Elisp source for providing Cdargs support in -Emacs. You don't need to install this package to have Emacs support for -Cdargs. - - %prep %autosetup -p1 @@ -97,16 +87,16 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h %files -n emacs-cdargs %dir %{_emacs_sitelispdir}/%{name} +%license COPYING +%{_emacs_sitelispdir}/%{name}/*.el %{_emacs_sitelispdir}/%{name}/*.elc %{_emacs_sitestartdir}/cdargs-init.el -%files -n emacs-cdargs-el -%license COPYING -%{_emacs_sitelispdir}/%{name}/*.el - - %changelog +* Wed Dec 12 2018 Tim Landscheidt - 1.35-20 +- Obsolete emacs-el subpackage (#1234562) + * Thu Jul 12 2018 Fedora Release Engineering - 1.35-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 31382c2110fabe96f4aa311651f05c6faab9a9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 22 Mar 2019 20:35:51 +0100 Subject: [PATCH 2/2] Remove emacs subpackage to conform with Emacs packaging guidelines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- cdargs.spec | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/cdargs.spec b/cdargs.spec index 1cabf5d..bedb385 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -2,7 +2,7 @@ Name: cdargs Version: 1.35 -Release: 20%{?dist} +Release: 21%{?dist} Summary: The shell cd with bookmarks and browser License: GPLv2+ URL: http://www.skamphausen.de/cgi-bin/ska/CDargs/ @@ -13,9 +13,10 @@ Patch0: %{name}-%{version}_shebangs.patch Patch1: %{name}-%{version}_format_security.patch Patch2: %{name}-%{version}_fix_fsf_address.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: ncurses-devel BuildRequires: emacs +Requires: emacs-filesystem >= %{_emacs_version} %description Enables the user to quickly change working directory by navigating cd arguments @@ -24,30 +25,12 @@ and expanding the shell built-in cd with bookmarks and browser. %package devel Summary: Development files for %{name} - -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains development files for %{name}. -%package -n emacs-cdargs -Summary: Cdargs support for Emacs -BuildArch: noarch - -Requires: %{name} = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} - -Provides: emacs-%{name}-el = %{version}-%{release} -Obsoletes: emacs-%{name}-el < 1.35-20 - -%description -n emacs-cdargs -This is an Emacs front-end to cdargs. It provides a function (cv or -cdargs) which uses the same bookmarks list as the terminal program -cdargs and lets the user quickly make a directory listed there the -current working directory. - - %prep %autosetup -p1 @@ -79,21 +62,20 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h %{_bindir}/cdargs %config(noreplace) %{profiledir}/cdargs.* %doc %{_mandir}/man1/cdargs.1* +%dir %{_emacs_sitelispdir}/%{name} +%{_emacs_sitelispdir}/%{name}/*.el +%{_emacs_sitelispdir}/%{name}/*.elc +%{_emacs_sitestartdir}/cdargs-init.el %files devel %{_includedir}/cdargs.h -%files -n emacs-cdargs -%dir %{_emacs_sitelispdir}/%{name} -%license COPYING -%{_emacs_sitelispdir}/%{name}/*.el -%{_emacs_sitelispdir}/%{name}/*.elc -%{_emacs_sitestartdir}/cdargs-init.el - - %changelog +* Fri Mar 22 20:25:44 CET 2019 Robert-André Mauchin - 1.35-21 +- Remove emacs subpackage to conform with Emacs packaging guidelines (#1234562) + * Wed Dec 12 2018 Tim Landscheidt - 1.35-20 - Obsolete emacs-el subpackage (#1234562) @@ -139,7 +121,7 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Sun Mar 14 2010 Jonathan G. Underwood - 1.35-6 -- Update spec file to bring it into compliance with Emacs add-on packaging +- Update spec file to bring it into compliance with Emacs add-on packaging guidelines - Split Elisp source files into separate subpackage @@ -151,7 +133,7 @@ install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h * Sun Jan 11 2009 Milos Jakubicek - 1.35-3 -- Fixed usage in other shells than bash: minor compatibility code changes and +- Fixed usage in other shells than bash: minor compatibility code changes and no complains because completion doesn't work (fix BZ#479398). * Tue Mar 25 2008 Milos Jakubicek - 1.35-2