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 42fb702..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cdargs -# $Id$ -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 -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/cdargs-1.35-36.fc37.src.rpm b/cdargs-1.35-36.fc37.src.rpm new file mode 100644 index 0000000..4903944 Binary files /dev/null and b/cdargs-1.35-36.fc37.src.rpm differ diff --git a/cdargs-1.35_configure_c99.patch b/cdargs-1.35_configure_c99.patch new file mode 100644 index 0000000..d20718f --- /dev/null +++ b/cdargs-1.35_configure_c99.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index 8567554..f4588d4 100755 +--- a/configure ++++ b/configure +@@ -2507,8 +2507,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/cdargs-1.35_fix_fsf_address.patch b/cdargs-1.35_fix_fsf_address.patch new file mode 100644 index 0000000..1753499 --- /dev/null +++ b/cdargs-1.35_fix_fsf_address.patch @@ -0,0 +1,47 @@ +diff -up cdargs-1.35/contrib/cdargs.el.fix_fsf_address cdargs-1.35/contrib/cdargs.el +--- cdargs-1.35/contrib/cdargs.el.fix_fsf_address 2003-02-23 23:10:31.000000000 +0100 ++++ cdargs-1.35/contrib/cdargs.el 2018-04-05 21:31:06.710480461 +0200 +@@ -17,8 +17,8 @@ + + ;; You should have received a copy of the GNU General Public License + ;; along with this program; see the file COPYING. If not, write to the Free +-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +-;; 02111-1307, USA. ++;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++;; Boston, MA 02110-1335, USA. + + + ;;; Commentary: +@@ -119,4 +119,4 @@ quick access." + + (provide 'cdargs) + +-;;; cdargs.el ends here +\ No newline at end of file ++;;; cdargs.el ends here +diff -up cdargs-1.35/src/cdargs.cc.fix_fsf_address cdargs-1.35/src/cdargs.cc +--- cdargs-1.35/src/cdargs.cc.fix_fsf_address 2006-02-26 18:06:47.000000000 +0100 ++++ cdargs-1.35/src/cdargs.cc 2018-04-05 21:31:47.933399214 +0200 +@@ -19,7 +19,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1335. + */ + + /********************************************************************/ +diff -up cdargs-1.35/src/cdargs.h.fix_fsf_address cdargs-1.35/src/cdargs.h +--- cdargs-1.35/src/cdargs.h.fix_fsf_address 2004-03-31 18:15:41.000000000 +0200 ++++ cdargs-1.35/src/cdargs.h 2018-04-05 21:32:40.166296267 +0200 +@@ -19,7 +19,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1335, USA. + */ + + diff --git a/cdargs-1.35_format_security.patch b/cdargs-1.35_format_security.patch new file mode 100644 index 0000000..3ddc550 --- /dev/null +++ b/cdargs-1.35_format_security.patch @@ -0,0 +1,13 @@ +diff --git a/src/cdargs.cc b/src/cdargs.cc +index e505e4e..1fdfeb8 100644 +--- a/src/cdargs.cc ++++ b/src/cdargs.cc +@@ -1301,7 +1301,7 @@ void helpscreen(void) { + + void fatal_exit(char* msg) { + endwin(); +- fprintf(stderr, msg); ++ fprintf(stderr, "%s", msg); + exit(1); + } + diff --git a/cdargs-1.35_shebangs.patch b/cdargs-1.35_shebangs.patch index 39d5e67..e7abb6e 100644 --- a/cdargs-1.35_shebangs.patch +++ b/cdargs-1.35_shebangs.patch @@ -7,6 +7,27 @@ diff -Naur cdargs-1.35/contrib/cdargs-bash.sh cdargs-1.35_patched/contrib/cdargs # (C) 2002-2003 Dan Allen and Stefan Kamphausen # Written by Dan Allen +@@ -166,7 +164,7 @@ + local tmpfile + + # first clear any bookmarks with this same alias, if file exists +- if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then ++ if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then + tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"` + tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM + grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs"; +@@ -256,4 +254,11 @@ + complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb + } + ++# we do not support anything besides bash completion ++# (however patches to support other shells are very welcome) ++ ++if [ -z "${BASH_VERSION}" ]; then ++ return 100 ++fi ++ + _cdargs_complete 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 diff --git a/cdargs.spec b/cdargs.spec index f1e0826..12b572a 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -1,105 +1,72 @@ -%define profiledir %{_sysconfdir}/profile.d +%define profiledir %{_sysconfdir}/profile.d -Name: cdargs -Version: 1.35 -Release: 2%{?dist} -Summary: The shell cd with bookmarks and browser +Name: cdargs +Version: 1.35 +Release: %autorelease +Summary: The shell cd with bookmarks and browser +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +URL: http://www.skamphausen.de/cgi-bin/ska/CDargs/ +Source0: http://www.skamphausen.de/downloads/cdargs/%{name}-%{version}.tar.gz +Source1: %{name}-%{version}_emacs-init.el -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) +Patch0: %{name}-%{version}_shebangs.patch +Patch1: %{name}-%{version}_format_security.patch +Patch2: %{name}-%{version}_fix_fsf_address.patch +Patch3: %{name}-%{version}_configure_c99.patch -BuildRequires: ncurses-devel +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel +BuildRequires: emacs +BuildRequires: make +Requires: emacs-filesystem >= %{_emacs_version} %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} +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{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 +%autosetup -p1 %build %configure -make %{?_smp_mflags} +%make_build +%{_emacs_bytecompile} contrib/cdargs.el %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install -mkdir -p $RPM_BUILD_ROOT%{profiledir} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +mkdir -p %{buildroot}%{profiledir} +mkdir -p %{buildroot}%{_emacs_sitestartdir} +mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} -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 +install -p -m 644 contrib/cdargs.el* %{buildroot}%{_emacs_sitelispdir}/%{name} +install -p -m 644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}/cdargs-init.el -%clean -rm -rf $RPM_BUILD_ROOT +install -p -m 644 contrib/cdargs-bash.sh %{buildroot}%{profiledir}/cdargs.sh +install -p -m 644 contrib/cdargs-tcsh.csh %{buildroot}%{profiledir}/cdargs.csh +install -D -p -m 644 src/cdargs.h %{buildroot}%{_includedir}/cdargs.h %files -%defattr(-, root, root, -) +%doc AUTHORS ChangeLog NEWS README THANKS +%license COPYING %{_bindir}/cdargs %config(noreplace) %{profiledir}/cdargs.* %doc %{_mandir}/man1/cdargs.1* -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO +%dir %{_emacs_sitelispdir}/%{name} +%{_emacs_sitelispdir}/%{name}/*.el +%{_emacs_sitelispdir}/%{name}/*.elc +%{_emacs_sitestartdir}/cdargs-init.el %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 +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..d42df28 --- /dev/null +++ b/changelog @@ -0,0 +1,104 @@ +* Wed Jan 19 2022 Fedora Release Engineering - 1.35-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.35-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.35-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.35-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.35-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.35-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Mar 22 20:25:44 CET 2019 Robert-André Mauchin - 1.35-22 +- Remove emacs subpackage to conform with Emacs packaging guidelines (#1234562) + +* Thu Jan 31 2019 Fedora Release Engineering - 1.35-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* 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 + +* Thu Apr 05 2018 Robert-André Mauchin - 1.35-18 +- Unorphaned +- Refresh SPEC + +* Wed Jun 17 2015 Fedora Release Engineering - 1.35-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.35-16 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Aug 15 2014 Fedora Release Engineering - 1.35-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 31 2014 Yaakov Selkowitz - 1.35-14 +- Fix FTBFS with -Werror=format-security (#1037010, #1106037) +- Cleanup spec + +* Sat Jun 07 2014 Fedora Release Engineering - 1.35-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.35-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.35-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.35-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 1.35-9 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 1.35-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.35-7 +- 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 + 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 + +* Mon Feb 23 2009 Fedora Release Engineering - 1.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + + +* Sun Jan 11 2009 Milos Jakubicek - 1.35-3 +- 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 +- 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 8cda820..5f781c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50be618d67f0b9f2439526193c69c567 cdargs-1.35.tar.gz +SHA512 (cdargs-1.35.tar.gz) = 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c