diff --git a/.gitignore b/.gitignore index c38ef56..4d76b61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /cmatrix-1.2a.tar.gz -/cmatrix-2.0.tar.gz diff --git a/cmatrix-x11-font-path.patch b/cmatrix-x11-font-path.patch deleted file mode 100644 index 05efe6e..0000000 --- a/cmatrix-x11-font-path.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2019-03-27 15:36:28.000000000 +0100 -+++ b/configure.ac 2020-11-26 12:18:10.789106711 +0100 -@@ -112,20 +112,23 @@ if test "x$enable_fonts" != xfalse; then - fi - - AC_PATH_PROG(MKFONTDIR, mkfontdir, "", $PATH:/usr/bin:/usr/bin/X11:/usr/local/bin/X11:/usr/X11R6/bin:/usr/local/bin:/sbin:/usr/sbin) -- AC_CHECK_FILES([/usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc]) -+ AC_CHECK_FILES([/usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc /usr/share/X11/fonts/misc]) - - if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then - if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then -+ if test "x$ac_cv_file__usr_share_X11_fonts_misc" = "xno"; then - AC_MSG_WARN([ - - *** You do not appear to have an X window fonts directory in the standard --*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The --*** mtx.pcf font will not be installed. This means you will probably not --*** be able to use the mtx fonts in your x terminals, and hence be unable --*** to use the -x command line switch. Sorry about that... -+*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc -+*** or /usr/share/X11/fonts/misc). The mtx.pcf font will not be installed -+*** This means you will probably not be able to use the mtx fonts in your -+*** x terminals, and hence be unable to use the -x command line switch. -+*** Sorry about that... - ]) - fi - fi -+ fi - fi - - dnl Parse any configure options -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2019-03-27 15:36:28.000000000 +0100 -+++ b/Makefile.am 2020-11-26 12:21:59.701060016 +0100 -@@ -28,16 +28,21 @@ install-data-local: - if test -d /usr/lib/X11/fonts/misc; then \ - echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \ - $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \ -- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \ - echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/lib/X11/fonts/misc; \ - echo " Done. If this is the first time you have installed CMatrix you will"; \ - echo " probably have to restart X window in order to use the mtx.pcf font."; \ -+ elif test -d /usr/share/X11/fonts/misc; then \ -+ echo " Installing X window matrix fonts in /usr/share/X11/fonts/misc..."; \ -+ $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/share/X11/fonts/misc; \ -+ echo " Running mkfontdir /usr/share/X11/fonts/misc..."; \ -+ $(MKFONTDIR) /usr/share/X11/fonts/misc; \ -+ echo " Done. If this is the first time you have installed CMatrix you will"; \ -+ echo " probably have to restart X window in order to use the mtx.pcf font."; \ - else \ - if test -d /usr/X11R6/lib/X11/fonts/misc; then \ - echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \ - $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \ -- $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \ - echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \ - echo " Done. If this is the first time you have installed CMatrix you will"; \ diff --git a/cmatrix.spec b/cmatrix.spec index 41bd0a0..b70f04b 100644 --- a/cmatrix.spec +++ b/cmatrix.spec @@ -3,24 +3,19 @@ %global aurgiturl https://git.archlinux.org/svntogit/community.git -Name: cmatrix -Version: 2.0 -Release: 12%{?dist} -Summary: A scrolling 'Matrix'-like screen +Name: cmatrix +Version: 1.2a +Release: 2%{?dist} +Summary: A scrolling 'Matrix'-like screen -License: GPL-2.0-or-later -URL: https://github.com/abishekvashok/%{name} -Source0: https://github.com/abishekvashok/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Source1: %{name}-tty -Patch0: cmatrix-x11-font-path.patch +License: GPLv2+ +URL: http://www.asty.org/%{name} +Source0: %{url}/dist/%{name}-%{version}.tar.gz +Source1: %{aurgiturl}/plain/trunk/%{name}-tty?h=packages/%{name}#/%{name}-tty -BuildRequires: gcc -BuildRequires: pkgconfig(ncurses) -BuildRequires: help2man -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: console-setup -BuildRequires: xorg-x11-fonts-misc +BuildRequires: gcc +BuildRequires: pkgconfig(ncurses) +BuildRequires: help2man %description @@ -45,21 +40,20 @@ The font seen in the famous movie 'The Matrix' to be used in X11. %autosetup cp -p %{SOURCE1} . # install fonts properly -sed -i -r 's: (%{_prefix}): \$(DESTDIR)\1:' Makefile.am +sed -i -r 's: (%{_prefix}): \$(DESTDIR)\1:' Makefile.in %build -autoreconf -ivf %configure %make_build help2man -N -o %{name}.1 ./%{name} %install -install -dm0755 %{buildroot}%{_exec_prefix}/lib/kbd/consolefonts +install -dm0755 %{buildroot}%{_datadir}/consolefonts %make_install install -Dpm0644 mtx.pcf %{buildroot}%{_x11fontdir}/misc/mtx.pcf -install -Dm755 %{SOURCE1} %{buildroot}%{_bindir} +install -Dm755 %{name}-tty %{buildroot}%{_bindir} install -Dpm0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 @@ -74,10 +68,12 @@ fi %files %license COPYING -%doc AUTHORS ChangeLog CODE_OF_CONDUCT.md CONTRIBUTING.md ISSUE_TEMPLATE.md NEWS README README.md +%doc AUTHORS NEWS README ChangeLog TODO %{_bindir}/%{name} %{_bindir}/%{name}-tty -%{_exec_prefix}/lib/kbd/consolefonts/matrix.* +# we don't want to depend on other consolefonts +%dir %{_datadir}/consolefonts +%{_datadir}/consolefonts/matrix.* %{_mandir}/man1/%{name}.1* %files x11-fonts @@ -89,57 +85,6 @@ fi %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 2.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 2.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Oct 28 2023 Didier Fabert - 2.0-7 -- migrated to SPDX license - -* Wed Jul 19 2023 Fedora Release Engineering - 2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Nov 25 2020 Didier Fabert - 2.0-1 -- Update from new upstream - -* Mon Jul 27 2020 Fedora Release Engineering - 1.2a-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.2a-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.2a-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.2a-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.2a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Wed Feb 07 2018 Fedora Release Engineering - 1.2a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index d2de506..acab9ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmatrix-2.0.tar.gz) = 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530 +SHA512 (cmatrix-1.2a.tar.gz) = a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82