From 3e6e4b5eb2b84bb4700f52d0c832fed890aa95f6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:01:23 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for cdargs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From b826569c44a5bb09c0409627c2cd09852466a826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?= Date: Mon, 15 Mar 2010 07:17:58 +0000 Subject: [PATCH 2/3] - apply patch from Jonathan Underwood to conform to current emacs guidelines (BZ#400077) --- cdargs.spec | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/cdargs.spec b/cdargs.spec index 0ccc965..8c4f1f1 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -2,7 +2,7 @@ Name: cdargs Version: 1.35 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The shell cd with bookmarks and browser Group: Applications/File @@ -13,7 +13,8 @@ Source1: %{name}-%{version}_emacs-init.el Patch0: %{name}-%{version}_shebangs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel +BuildRequires: emacs %description Enables the user to quickly change working directory by navigating cd arguments @@ -31,9 +32,10 @@ This package contains development files for %{name}. %package -n emacs-cdargs Summary: Cdargs support for Emacs Group: Applications/Editors +BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: emacs(bin) >= 22.1-8 +Requires: emacs(bin) >= %{_emacs_version} %description -n emacs-cdargs This is an Emacs front-end to cdargs. It provides a function (cv or @@ -41,6 +43,18 @@ 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. +%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 %setup -q %patch0 -p1 @@ -48,16 +62,19 @@ current working directory. %build %configure make %{?_smp_mflags} +%{_emacs_bytecompile} contrib/cdargs.el %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{profiledir} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} + +install -p -m 644 contrib/cdargs.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/cdargs-init.el -install -p -m 644 contrib/cdargs.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/cdargs.el -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/cdargs-init.el install -p -m 644 contrib/cdargs-bash.sh $RPM_BUILD_ROOT%{profiledir}/cdargs.sh install -p -m 644 contrib/cdargs-tcsh.csh $RPM_BUILD_ROOT%{profiledir}/cdargs.csh install -D -p -m 644 src/cdargs.h $RPM_BUILD_ROOT%{_includedir}/cdargs.h @@ -78,10 +95,20 @@ rm -rf $RPM_BUILD_ROOT %files -n emacs-cdargs %defattr(-, root, root, -) -%{_datadir}/emacs/site-lisp/cdargs.el -%{_datadir}/emacs/site-lisp/site-start.d/cdargs-init.el +%dir %{_emacs_sitelispdir}/%{name} +%{_emacs_sitelispdir}/%{name}/*.elc +%{_emacs_sitestartdir}/cdargs-init.el + +%files -n emacs-cdargs-el +%defattr(-, root, root, -) +%{_emacs_sitelispdir}/%{name}/*.el %changelog +* Sun Mar 14 2010 Jonathan G. Underwood - 1.35-6 +- Update spec file to bring it into compliance with Emacs add-on packaging + guidelines +- Split Elisp source files into separate subpackage + * Fri Jul 24 2009 Fedora Release Engineering - 1.35-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From ee2251acc787e3166184b361bb8f83cf8d0195cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:30:25 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d9116e0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cdargs -# $Id: Makefile,v 1.1 2008/03/26 15:59:49 kevin Exp $ -NAME := cdargs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13