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.spec b/cdargs.spec index f973db7..3a87820 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -1,41 +1,41 @@ -%define profiledir %{_sysconfdir}/profile.d +%define profiledir %{_sysconfdir}/profile.d -Name: cdargs -Version: 1.35 -Release: 17%{?dist} -Summary: The shell cd with bookmarks and browser +Name: cdargs +Version: 1.35 +Release: 18%{?dist} +Summary: The shell cd with bookmarks and browser +License: GPLv2+ +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/cgi-bin/ska/CDargs/ -Source0: http://www.skamphausen.de/downloads/cdargs/%{name}-%{version}.tar.gz -Source1: %{name}-%{version}_emacs-init.el -Patch0: %{name}-%{version}_shebangs.patch -Patch1: %{name}-1.35_format_security.patch +Patch0: %{name}-%{version}_shebangs.patch +Patch1: %{name}-%{version}_format_security.patch +Patch2: %{name}-%{version}_fix_fsf_address.patch -BuildRequires: ncurses-devel -BuildRequires: emacs +BuildRequires: ncurses-devel +BuildRequires: emacs %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} +%package devel +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 -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} +%package -n emacs-cdargs +Summary: Cdargs support for Emacs +BuildArch: noarch + +Requires: %{name} = %{version}-%{release} +Requires: emacs(bin) >= %{_emacs_version} %description -n emacs-cdargs This is an Emacs front-end to cdargs. It provides a function (cv or @@ -43,60 +43,73 @@ 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} +%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 -%patch1 -p1 +%autosetup -p1 + %build %configure -make %{?_smp_mflags} +%make_build %{_emacs_bytecompile} contrib/cdargs.el + %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install -mkdir -p $RPM_BUILD_ROOT%{profiledir} -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} -mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +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%{_emacs_sitelispdir}/%{name} -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/cdargs-init.el +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-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 -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 %files +%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 + %files devel %{_includedir}/cdargs.h + %files -n emacs-cdargs %dir %{_emacs_sitelispdir}/%{name} %{_emacs_sitelispdir}/%{name}/*.elc %{_emacs_sitestartdir}/cdargs-init.el + %files -n emacs-cdargs-el +%license COPYING %{_emacs_sitelispdir}/%{name}/*.el + %changelog +* 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 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