From bfd0ea18ab810aa7d053d3f32fce007f639b0099 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 26 Mar 2008 15:59:58 +0000 Subject: [PATCH 1/4] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From b08e8a727734825e00495964b5930756eade9453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?= Date: Wed, 26 Mar 2008 17:16:28 +0000 Subject: [PATCH 2/4] Initial commit. --- .cvsignore | 1 + cdargs-1.35_emacs-init.el | 2 + cdargs-1.35_shebangs.patch | 18 +++++++ cdargs.spec | 105 +++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 127 insertions(+) create mode 100644 cdargs-1.35_emacs-init.el create mode 100644 cdargs-1.35_shebangs.patch create mode 100644 cdargs.spec diff --git a/.cvsignore b/.cvsignore index e69de29..996a158 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +cdargs-1.35.tar.gz diff --git a/cdargs-1.35_emacs-init.el b/cdargs-1.35_emacs-init.el new file mode 100644 index 0000000..bd068bd --- /dev/null +++ b/cdargs-1.35_emacs-init.el @@ -0,0 +1,2 @@ +;; This defines the function cdargs and an alias cv +(require 'cdargs) diff --git a/cdargs-1.35_shebangs.patch b/cdargs-1.35_shebangs.patch new file mode 100644 index 0000000..39d5e67 --- /dev/null +++ b/cdargs-1.35_shebangs.patch @@ -0,0 +1,18 @@ +diff -Naur cdargs-1.35/contrib/cdargs-bash.sh cdargs-1.35_patched/contrib/cdargs-bash.sh +--- cdargs-1.35/contrib/cdargs-bash.sh 2006-03-03 00:28:17.000000000 +0100 ++++ cdargs-1.35_patched/contrib/cdargs-bash.sh 2008-03-08 11:02:21.000000000 +0100 +@@ -1,5 +1,3 @@ +-#!/bin/sh +- + # (C) 2002-2003 Dan Allen and Stefan Kamphausen + + # Written by Dan Allen +diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh +--- cdargs-1.35/contrib/cdargs-tcsh.csh 2005-11-06 11:58:13.000000000 +0100 ++++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh 2008-03-08 11:02:29.000000000 +0100 +@@ -1,5 +1,3 @@ +-#!/bin/csh +- + # (C) 2002-2005 Stefan Kamphausen + + # (T)CShell extensions written by diff --git a/cdargs.spec b/cdargs.spec new file mode 100644 index 0000000..f1e0826 --- /dev/null +++ b/cdargs.spec @@ -0,0 +1,105 @@ +%define profiledir %{_sysconfdir}/profile.d + +Name: cdargs +Version: 1.35 +Release: 2%{?dist} +Summary: The shell cd with bookmarks and browser + +Group: Applications/File +License: GPLv2+ +URL: http://www.skamphausen.de/software/cdargs/ +Source0: http://www.skamphausen.de/software/cdargs/%{name}-%{version}.tar.gz +Source1: %{name}-%{version}_emacs-init.el +Patch0: %{name}-%{version}_shebangs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ncurses-devel + +%description +Enables the user to quickly change working directory by navigating cd arguments +and expanding the shell built-in cd with bookmarks and browser. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries + +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development files for %{name}. + +%package -n emacs-cdargs +Summary: Cdargs support for Emacs +Group: Applications/Editors + +Requires: %{name} = %{version}-%{release} +Requires: emacs(bin) >= 22.1-8 + +%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 +%setup -q +%patch0 -p1 + +%build +%configure +make %{?_smp_mflags} + +%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 + +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 + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root, -) +%{_bindir}/cdargs +%config(noreplace) %{profiledir}/cdargs.* +%doc %{_mandir}/man1/cdargs.1* +%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO + +%files devel +%defattr(-, root, root, -) +%{_includedir}/cdargs.h + +%files -n emacs-cdargs +%defattr(-, root, root, -) +%{_datadir}/emacs/site-lisp/cdargs.el +%{_datadir}/emacs/site-lisp/site-start.d/cdargs-init.el + +%changelog + +* Tue Mar 25 2008 Milos Jakubicek - 1.35-2 +- Fixed non-capital starting letter in the summary of emacs-cdargs subpackage. + +* Sat Mar 08 2008 Milos Jakubicek - 1.35-1 +- Initial package based on SRPM provided by author. +- Removed Packager: and Vendor: field. +- Removed unnecessary making RPM_BUILD_ROOT directory. +- Changed license from GPL to GPLv2+. +- Extended description. +- Setup section is silent now (-p). +- Added SMP flags for building. +- Added directory mode to defattr. +- Added dist tag. +- Changed buildroot directory to default. +- Removed execute rights and shebangs (Patch0) from cdargs.sh, cdargs.csh as + they will be only sourced, not executed. +- Both files cdargs.sh and cdargs.csh marked as config(noreplace). +- Added -devel subpackage with cdargs.h +- Added emacs-cdargs subpackage with cdargs.el +- Added emacs init script as Source1 diff --git a/sources b/sources index e69de29..8cda820 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +50be618d67f0b9f2439526193c69c567 cdargs-1.35.tar.gz From e742d166a6a8d86a13b7cc3de4beedb499445248 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:33 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42fb702..d9116e0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: cdargs -# $Id$ +# $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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From 69a2417a4d6aa6407a725086784e497ab7bd588d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:30:24 +0000 Subject: [PATCH 4/4] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8