diff --git a/cdargs-1.35-36.fc37.src.rpm b/cdargs-1.35-36.fc37.src.rpm deleted file mode 100644 index 4903944..0000000 Binary files a/cdargs-1.35-36.fc37.src.rpm and /dev/null differ diff --git a/cdargs-1.35_configure_c99.patch b/cdargs-1.35_configure_c99.patch deleted file mode 100644 index d20718f..0000000 --- a/cdargs-1.35_configure_c99.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 1753499..0000000 --- a/cdargs-1.35_fix_fsf_address.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 deleted file mode 100644 index 3ddc550..0000000 --- a/cdargs-1.35_format_security.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.spec b/cdargs.spec index 12b572a..5e1992c 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -1,72 +1,109 @@ -%define profiledir %{_sysconfdir}/profile.d +%define profiledir %{_sysconfdir}/profile.d -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 +Name: cdargs +Version: 1.35 +Release: 3%{?dist} +Summary: The shell cd with bookmarks and browser -Patch0: %{name}-%{version}_shebangs.patch -Patch1: %{name}-%{version}_format_security.patch -Patch2: %{name}-%{version}_fix_fsf_address.patch -Patch3: %{name}-%{version}_configure_c99.patch +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: gcc-c++ -BuildRequires: ncurses-devel -BuildRequires: emacs -BuildRequires: make -Requires: emacs-filesystem >= %{_emacs_version} +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} -Requires: %{name}%{?_isa} = %{version}-%{release} +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 -%autosetup -p1 +%setup -q +%patch0 -p1 %build %configure -%make_build -%{_emacs_bytecompile} contrib/cdargs.el +make %{?_smp_mflags} %install -%make_install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p %{buildroot}%{profiledir} -mkdir -p %{buildroot}%{_emacs_sitestartdir} -mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} +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* %{buildroot}%{_emacs_sitelispdir}/%{name} -install -p -m 644 %{SOURCE1} %{buildroot}%{_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 -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 +%clean +rm -rf $RPM_BUILD_ROOT %files -%doc AUTHORS ChangeLog NEWS README THANKS -%license COPYING +%defattr(-, root, root, -) %{_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 +%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 -%autochangelog + +* 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/changelog b/changelog deleted file mode 100644 index d42df28..0000000 --- a/changelog +++ /dev/null @@ -1,104 +0,0 @@ -* 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 5f781c0..8cda820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cdargs-1.35.tar.gz) = 13df5d18de6f62309a0ecccc0dd95508d81d1955f87cfd2962360d3b7d74c5cdc2b0d2e00f7a4f1e7556bfbcbd3e2ecf4847a1a48ab47442e6d2d5a36db0cf0c +50be618d67f0b9f2439526193c69c567 cdargs-1.35.tar.gz