diff --git a/.gitignore b/.gitignore index b767366..0a5c679 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ emacspeak-29.0.tar.bz2 /emacspeak-40.0.tar.bz2 /emacspeak-45.0.tar.bz2 /emacspeak-54.0.tar.bz2 -/emacspeak-59.0.tar.bz2 -/emacspeak-60.0.tar.bz2 diff --git a/emacspeak-38.0-update-FSF-address.patch b/emacspeak-38.0-update-FSF-address.patch new file mode 100644 index 0000000..f42b313 --- /dev/null +++ b/emacspeak-38.0-update-FSF-address.patch @@ -0,0 +1,30 @@ +Index: lisp/amixer.el +=================================================================== +--- lisp/amixer.el (revision 8448) ++++ lisp/amixer.el (working copy) +@@ -19,8 +19,8 @@ + ;;; GNU General Public License for more details. + ;;; + ;;; You should have received a copy of the GNU General Public License +-;;; along with GNU Emacs; see the file COPYING. If not, write to +-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++;;; along with this program; if not, write to the Free Software ++;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + ;;}}} + ;;{{{ introduction +Index: lisp/cd-tool.el +=================================================================== +--- lisp/cd-tool.el (revision 8448) ++++ lisp/cd-tool.el (working copy) +@@ -19,8 +19,8 @@ + ;;; GNU General Public License for more details. + ;;; + ;;; You should have received a copy of the GNU General Public License +-;;; along with GNU Emacs; see the file COPYING. If not, write to +-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++;;; along with this program; if not, write to the Free Software ++;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + ;;}}} + ;;{{{ introduction diff --git a/emacspeak.spec b/emacspeak.spec index 6717ab2..77ef871 100644 --- a/emacspeak.spec +++ b/emacspeak.spec @@ -1,9 +1,10 @@ Summary: Emacs Speech interface Name: emacspeak -Version: 60.0 -Release: 3%{?dist} +Version: 54.0 +Release: 4%{?dist} # main lisp files are GPL2+ -License: GPL-2.0-or-later AND BSD-3-Clause +# lisp/atom-blogger and lisp/g-client are BSD +License: GPLv2+ and BSD Source: https://github.com/tvraman/emacspeak/releases/download/%{version}/%{name}-%{version}.tar.bz2 URL: http://emacspeak.sourceforge.net/ BuildRequires: emacs @@ -12,10 +13,12 @@ BuildRequires: gcc-c++ BuildRequires: perl-interpreter BuildRequires: perl-generators BuildRequires: texinfo -BuildRequires: tcl-devel < 1:9 +BuildRequires: tcl-devel BuildRequires: make Requires: emacs(bin) >= %{_emacs_version} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: tclx +Patch5: emacspeak-38.0-update-FSF-address.patch %description Emacspeak is a speech interface that allows visually impaired users to @@ -30,6 +33,7 @@ opens up the Internet to visually impaired users around the world. %prep %setup -q +%patch5 -p0 chmod a-x etc/COPYRIGHT @@ -43,7 +47,7 @@ make espeak %install mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak -cp -pr bash-utils etc lisp media servers sounds stumpwm xsl %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/ +cp -pr bash-utils etc lisp media nyxttalk servers sounds stumpwm xsl %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/ make -C servers/native-espeak install LIBPARENTDIR=%{buildroot}%{_libdir} ln -sf %{_libdir}/emacspeak/servers/native-espeak/tclespeak.so %{buildroot}%{_datadir}/emacs/site-lisp/emacspeak/servers/native-espeak/ @@ -77,44 +81,6 @@ cp -p info/*.info* %{buildroot}%{_infodir} %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 60.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 60.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 14 2025 Jens Petersen - 60.0-1 -- Update to 60.0 -- https://tvraman.github.io/emacspeak/blog/Announce-60.html - -* Wed Jul 17 2024 Fedora Release Engineering - 59.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Feb 29 2024 Parag Nemade - 59.0-3 -- Migrate existing license tag to SPDX expression - -* Wed Jan 24 2024 Fedora Release Engineering - 59.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Jens Petersen - 59.0-1 -- update to 59.0 -- http://tvraman.github.io/emacspeak/blog/Announce-59.html - -* Fri Jan 19 2024 Fedora Release Engineering - 54.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 54.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 54.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 54.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 01 2022 Jitka Plesnikova - 54.0-5 -- Perl 5.36 rebuild - * Thu Jan 20 2022 Fedora Release Engineering - 54.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 4ca8fac..6b049bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (emacspeak-60.0.tar.bz2) = f48040f2dfaf7cb67d779d219c59477aaddb9c8b400666e5e9d9850e75575d5276f5b596ab1e8976057e5078d914a610cd537068ccc748e6c45aef64b02eaba9 +SHA512 (emacspeak-54.0.tar.bz2) = 088b8d08258202e5cc12ad1e2a56eabe27e626157201f4b665da78f7f4f03ea858746131d5c27a261049283a35eeb0fd5bb47aa054acac8a9b65a32da39a2f35