From 74d70340dcf8bcee9aa1c8f7ea54c971440bf3bb Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 30 Dec 2020 13:53:05 -0700 Subject: [PATCH 1/3] Updating to ucblogo 6.2 --- ucblogo.desktop | 8 ------ ucblogo.spec | 65 +++++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 35 deletions(-) delete mode 100644 ucblogo.desktop diff --git a/ucblogo.desktop b/ucblogo.desktop deleted file mode 100644 index 5d0ed1f..0000000 --- a/ucblogo.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=UCBLogo -GenericName=Logo Programming Language -Exec=logo-wx -Icon=ucblogo -Terminal=false -Type=Application -Categories=Education diff --git a/ucblogo.spec b/ucblogo.spec index 06b643d..f604ab2 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,11 +1,10 @@ Name: ucblogo -Version: 6.1 -Release: 2%{?dist} +Version: 6.2 +Release: 1%{?dist} Summary: An interpreter for the Logo programming language License: GPLv3+ -Source: https://github.com/jrincayc/ucblogo-code/archive/version_%{version}.tar.gz -Source1: %{name}.desktop +Source: https://github.com/jrincayc/ucblogo-code/releases/download/version_%{version}/ucblogo-%{version}.tar.gz URL: https://people.eecs.berkeley.edu/~bh/logo.html BuildRequires: gcc BuildRequires: gcc-c++ @@ -45,47 +44,48 @@ BuildArch: noarch This package includes HTML and PDF documentation for ucblogo and the Program Logic Manual (plm) +%package x11 +Summary: X11 version for ucblogo +Requires: %{name} = %{version}-%{release} + +%description x11 +This package contains the x11 binary for ucblogo. + %prep -%setup -q -n ucblogo-code-version_%{version} +%setup -q # correct directories /usr/lib -> /usr/share and /usr/local -> /usr sed -i 's|/local/lib/logo|/share/logo|g' *.c README.md sed -i 's|/lib/logo|/share/logo|g' *.c makefile* -sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" docs/usermanual.texi +sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" docs/ucblogo.texi sed -i "s|/usr/local/bin/logo|%{_bindir}/logo|g" README.md sed -i "s|/usr/local/info|%{_datadir}/info|g" README.md -find -name 'CVS' | xargs rm -rf -find -name '.svn' | xargs rm -rf - %build -# build WX version -%configure --with-wx-config=/usr/bin/wx-config-3.0 -make %{_smp_mflags} logo -mv logo logo-wx # build traditional version +%configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --enable-x11 --with-wx-config=no +%make_build ucblogo +mv ucblogo ucblogo-x11 +# build wx version make clean -%configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x --with-wx-config=no -make %{_smp_mflags} -# build docs -make make-docs +%configure --with-wx-config=/usr/bin/wx-config-3.0 +%make_build +# build html docs +make html %install -#Note: makefile does not support DESTDIR -%makeinstall +%make_install -install -m0755 logo-wx ${RPM_BUILD_ROOT}%{_bindir} +install -m0755 ucblogo-x11 ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/info -mv -f ${RPM_BUILD_ROOT}%{_prefix}/info/* ${RPM_BUILD_ROOT}%{_datadir}/info -rm -fr ${RPM_BUILD_ROOT}%{_prefix}/info -rm -fr ${RPM_BUILD_ROOT}%{_datadir}/logo/docs -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1} +desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps install -p -m 644 ucblogo.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps +install -p -m 644 plm $RPM_BUILD_ROOT%{_datadir}/doc/ucblogo rm -f ${RPM_BUILD_ROOT}%{_bindir}/install-logo-mode @@ -100,17 +100,28 @@ fi %files %doc README.md changes.txt %license LICENSE -%{_bindir}/* -%{_datadir}/logo +%{_bindir}/ucblogo %{_infodir}/* %{_mandir}/man1/logo* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/256x256/apps/%{name}.png +%{_datadir}/ucblogo/csls/* +%{_datadir}/ucblogo/helpfiles/* +%{_datadir}/ucblogo/logolib/* +%{_datadir}/pixmaps/ucblogo.xpm %files doc -%doc docs/html docs/usermanual.pdf plm +%{_datadir}/doc/ucblogo/ucblogo.pdf +%{_datadir}/doc/ucblogo/ucblogo.html +%{_datadir}/doc/ucblogo/plm + +%files x11 +%{_bindir}/ucblogo-x11 %changelog +* Wed Dec 30 2020 Joshua Cogliati - 6.2-1 +- Updating to 6.2 release and splitting x11 binary to separate package + * Fri Jan 31 2020 Fedora Release Engineering - 6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 75ed12e8717345ff0e55937d7795e89f080699a1 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 30 Dec 2020 14:23:06 -0700 Subject: [PATCH 2/3] Updating sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 22f25c1..7a79d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ucblogo-6.0.tar.gz logo-mode.tar.gz /version_6.1.tar.gz +/ucblogo-6.2.tar.gz diff --git a/sources b/sources index e583681..325cd99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (version_6.1.tar.gz) = 449fde8f5e200aa4ba712fe5af67e814c820f1b3beffb35f19244f34864c3fc0f73db8f1e25dfb11919081cee01319a6df2592644270e2fdd4137fd2f907ee82 +SHA512 (ucblogo-6.2.tar.gz) = 1368d78439863a91195bbd66cf7622833e52501de779e827d4383a7c37f7fb47858ac00b78435fced0b0802f9195069348a8370663f9d94edce0a0edaa993fa6 From 8447e5114b7eaf053c46b21f8300427af7816e91 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Thu, 31 Dec 2020 09:52:53 -0700 Subject: [PATCH 3/3] Updating to 6.2.1 (fixes manpage) --- .gitignore | 1 + sources | 2 +- ucblogo.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a79d0b..0371816 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ucblogo-6.0.tar.gz logo-mode.tar.gz /version_6.1.tar.gz /ucblogo-6.2.tar.gz +/ucblogo-6.2.1.tar.gz diff --git a/sources b/sources index 325cd99..2a78465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ucblogo-6.2.tar.gz) = 1368d78439863a91195bbd66cf7622833e52501de779e827d4383a7c37f7fb47858ac00b78435fced0b0802f9195069348a8370663f9d94edce0a0edaa993fa6 +SHA512 (ucblogo-6.2.1.tar.gz) = f6c42f5f97984717a39498f1fd050ba84371aee57fb234dc3b9101eab33f9013f3aaa7a8bcc9c4efef3603e4a11b2990b322837c0f0ce633e5070ba7b4b903fb diff --git a/ucblogo.spec b/ucblogo.spec index f604ab2..a5ddeae 100644 --- a/ucblogo.spec +++ b/ucblogo.spec @@ -1,5 +1,5 @@ Name: ucblogo -Version: 6.2 +Version: 6.2.1 Release: 1%{?dist} Summary: An interpreter for the Logo programming language @@ -88,6 +88,7 @@ install -p -m 644 ucblogo.png \ install -p -m 644 plm $RPM_BUILD_ROOT%{_datadir}/doc/ucblogo rm -f ${RPM_BUILD_ROOT}%{_bindir}/install-logo-mode +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %post /sbin/install-info %{_infodir}/ucblogo.info --entry="* UCBLogo: (ucblogo). Berkeley Logo User Manual." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || : @@ -101,8 +102,8 @@ fi %doc README.md changes.txt %license LICENSE %{_bindir}/ucblogo -%{_infodir}/* -%{_mandir}/man1/logo* +%{_infodir}/*.info* +%{_mandir}/man1/ucblogo* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/256x256/apps/%{name}.png %{_datadir}/ucblogo/csls/* @@ -119,6 +120,9 @@ fi %{_bindir}/ucblogo-x11 %changelog +* Thu Dec 31 2020 Joshua Cogliati - 6.2.1-1 +- Updating to 6.2.1 release + * Wed Dec 30 2020 Joshua Cogliati - 6.2-1 - Updating to 6.2 release and splitting x11 binary to separate package