Merge pull request #44 from danielhams/thinlymaster

Updates for 0.0.5beta

Author: danielhams

README.md

@@ -16,24 +16,26 @@ The modifications from the original fedora `.spec` files fall under the license
 
 NOTE: While we are not yet out of beta, it is recommended to remove any previous sgug-rse installation before extracting this new one. We don't yet support in-place upgrades using RPMs.
 
+(0) Add your user account to the irix `sys` group - this will allow you to use the sgug `sudo` out of the box with your user password - then you can follow the steps below without additional hoop jumping.
+
 (1) Download the artifacts for the latest version from the github releases tab (assuming they aren't too big).
 
 You'll find three main archives - and there might be "update" archives too that need to be extracted:
 
 ```
-sgug-rse-selfhoster-0.0.4beta.tar.gz
-sgug-rse-srpms-0.0.4beta.tar.gz
-sgug-rse-rpms-0.0.4beta.tar.gz
+sgug-rse-selfhoster-0.0.5beta.tar.gz
+sgug-rse-srpms-0.0.5beta.tar.gz
+sgug-rse-rpms-0.0.5beta.tar.gz
 
-sgug-rse-rpms-0.0.4betaupdateNUM.tar.gz
+sgug-rse-rpms-0.0.5betaupdateNUM.tar.gz
 ```
 
 (2) Extract the selfhoster archive under /usr as root (important, sgug-rse _installation_ files are root owned and managed):
 
 ```
 su - (enter root password)
 cd /usr
-gunzip -dc /path/to/sgug-rse-selfhoster-0.0.4beta.tar.gz |tar xf -
+gunzip -dc /path/to/sgug-rse-selfhoster-0.0.5beta.tar.gz |tar xf -
 (log out of root)
 ```
 
@@ -50,19 +52,19 @@ mkdir -p ~/rpmbuild/RPMS
 
 ```
 cd ~/rpmbuild
-gunzip -dc /path/to/sgug-rse-srpms-0.0.4beta.tar.gz | tar xf -
-gunzip -dc /path/to/sgug-rse-rpms-0.0.4beta.tar.gz | tar xf -
+gunzip -dc /path/to/sgug-rse-srpms-0.0.5beta.tar.gz | tar xf -
+gunzip -dc /path/to/sgug-rse-rpms-0.0.5beta.tar.gz | tar xf -
 # Optional
 mkdir ~/rpmupdates
 cd ~/rpmupdates
-gunzip -dc /path/to/sgug-rse-rpms-0.0.4betaupdateNUM.tar.gz | tar xf -
+gunzip -dc /path/to/sgug-rse-rpms-0.0.5betaupdateNUM.tar.gz | tar xf -
 ```
 
 (5) You'll need to clone this repo (sgug-rse) -
 
 ```
 cd ~
-git clone https://github.com/sgidevnet/sgug-rse.git sgug-rse.git
+/usr/sgug/bin/git clone https://github.com/sgidevnet/sgug-rse.git sgug-rse.git
 ```
 Adjust that path as appropriate for where you wish the repo to live.
 
@@ -79,14 +81,16 @@ sudo rpm --reinstall -ivh noarch/*.rpm mips/*.rpm
 
 and for any upgrades/updates:
 
+* CARE: You must use the "upgrade" flag for any upgraded packages to void double-installs
+
 ```
 cd ~/sgug-rse.git
 ./sgugshell.sh
 cd ~/rpmupdates/RPMS
 sudo rpm -Uvh noarch/*.rpm mips/*.rpm
 ```
 
-(7) Now you can build a package with:
+(7) Now you can rebuild one of the out-of-the-box packages with:
 
 ```
 cd ~/sgug-rse.git
@@ -97,13 +101,12 @@ cp -r ~/sgug-rse.git/packages/m4/* ~/rpmbuild/
 rpmbuild -ba m4.spec --nocheck
 ```
 
-(8) Installing RPMs must be done as root (add `--reinstall` to refresh a package):
+(8) Installing RPMs must be done as root (add `--reinstall` to refresh an already installed package):
 
 ```
-su -
 cd ~user/sgug-rse.git
 ./sgugshell.sh
-rpm -ivh ~/rpmbuild/RPMS/mips/m4*.rpm
+sudo rpm -ivh ~/rpmbuild/RPMS/mips/m4*.rpm
 ```
 
 ## Bugs

helperscripts/copyback.pl

@@ -53,10 +53,12 @@
 	my $rpmbuildFile = File::HomeDir->my_home."/rpmbuild/$sourceFile";
 	my $targetFile = "./packages/$packageName/$sourceFile";
 
-	my $cmd = "cp $rpmbuildFile $targetFile";
-	print "Command is '$cmd'\n";
+	if( -e $rpmbuildFile) {
+	    my $cmd = "cp $rpmbuildFile $targetFile";
+	    print "Command is '$cmd'\n";
 
-	copy($rpmbuildFile, $targetFile) or die "Copy failed: $!";
+	    copy($rpmbuildFile, $targetFile) or die "Copy failed: $!";
+	}
     }
 }
 

packages/chkconfig/SOURCES/chkconfig.sgifixes.patch renamed to packages/alternatives/SOURCES/alternatives.sgifixes.patch

@@ -1,91 +1,68 @@
-Summary: A system tool for maintaining the /etc/rc*.d hierarchy
-Name: chkconfig
+# This package is able to use optimised linker flags.
+%global build_ldflags %{sgug_optimised_ldflags}
+
+Summary: A tool to maintain symbolic links determining default commands
+Name: alternatives
 Version: 1.11
-Release: 5%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 URL: https://github.com/fedora-sysv/chkconfig
-Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc
-Conflicts: initscripts <= 5.30-1
+Source: https://github.com/fedora-sysv/chkconfig/archive/chkconfig-%{version}.tar.gz#/chkconfig-%{version}.tar.gz
+BuildRequires: libdicl-devel >= 0.1.19
+Requires:      libdicl >= 0.1.19
 
-%description
-Chkconfig is a basic system utility.  It updates and queries runlevel
-information for system services.  Chkconfig manipulates the numerous
-symbolic links in /etc/rc.d, to relieve system administrators of some 
-of the drudgery of manually editing the symbolic links.
-
-%package -n ntsysv
-Summary: A tool to set the stop/start of system services in a runlevel
-Requires: chkconfig = %{version}-%{release}
-
-%description -n ntsysv
-Ntsysv provides a simple interface for setting which system services
-are started or stopped in various runlevels (instead of directly
-manipulating the numerous symbolic links in /etc/rc.d). Unless you
-specify a runlevel or runlevels on the command line (see the man
-page), ntsysv configures the current runlevel (5 if you're using X).
-
-%package -n alternatives
-Summary: A tool to maintain symbolic links determining default commands
+Patch0:        alternatives.sgifixes.patch
 
-%description -n alternatives
+%description
 alternatives creates, removes, maintains and displays information about the
 symbolic links comprising the alternatives system. It is possible for several
 programs fulfilling the same or similar functions to be installed on a single
 system at the same time.
 
 %prep
-%setup -q
+%setup -q -n chkconfig-%{version}
+%patch0 -p1 -b .sgifixes
+
+# Rewrite some hardcoded paths in the alternatives source
+perl -pi -e "s|/etc/alternatives|%{_prefix}/etc/alternatives|g" alternatives.c
+perl -pi -e "s|/var/lib/alternatives|%{_prefix}/var/lib/alternatives|g" alternatives.c
+perl -pi -e "s|/usr/share/locale|%{_prefix}/share/locale|g" alternatives.c
 
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags}
+export CPPFLAGS="-I%{_includedir}/libdicl-0.1"
+export RPM_LD_FLAGS="-ldicl-0.1 -lintl $RPM_LD_FLAGS"
+V=1 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags}
 
 %check
-make check
+export CPPFLAGS="-I%{_includedir}/libdicl-0.1"
+export LIBS="-ldicl-0.1"
+V=1 make check
 
 %install
+export CPPFLAGS="-I%{_includedir}/libdicl-0.1"
+export LIBS="-ldicl-0.1"
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} install
+make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} ALTDIR=%{_prefix}/var/lib/alternatives ALTDATADIR=%{_prefix}/etc/alternatives install
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d
-for n in 0 1 2 3 4 5 6; do
-    mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc${n}.d
-    ln -s rc.d/rc${n}.d $RPM_BUILD_ROOT/etc/rc${n}.d
-done
-mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d
+rm $RPM_BUILD_ROOT%{_mandir}/man8/chkconfig*
+rm $RPM_BUILD_ROOT%{_mandir}/man8/ntsysv*
 
-%find_lang %{name}
+#find_lang %{name}
 
-%files -f %{name}.lang
-%defattr(-,root,root)
-%{!?_licensedir:%global license %%doc}
+#files -f %{name}.lang
+%files
 %license COPYING
-/sbin/chkconfig
-/etc/chkconfig.d
-/etc/init.d
-/etc/rc.d
-/etc/rc.d/init.d
-/etc/rc[0-6].d
-/etc/rc.d/rc[0-6].d
-%{_mandir}/*/chkconfig*
-%{_prefix}/lib/systemd/systemd-sysv-install
-
-%files -n ntsysv
-%defattr(-,root,root)
-%{_sbindir}/ntsysv
-%{_mandir}/*/ntsysv.8*
-
-%files -n alternatives
-%license COPYING
-%dir /etc/alternatives
+%dir %{_prefix}/etc/alternatives
 %{_sbindir}/update-alternatives
 %{_sbindir}/alternatives
 %{_mandir}/*/update-alternatives*
 %{_mandir}/*/alternatives*
-%dir /var/lib/alternatives
+%dir %{_prefix}/var/lib/alternatives
 
 %changelog
+* Fri Apr 10 2020 Daniel Hams <[email protected]> - 1.11-8
+- Moved from chkconfig to specific alternatives package
+
 * Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 1.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

packages/chkconfig/SPECS/chkconfig.spec.origfedora renamed to packages/alternatives/SPECS/alternatives.spec

@@ -0,0 +1,2 @@
+This is actually an extract of the alternatives pieces from chkconfig, check
+there for the original spec.

packages/alternatives/SPECS/readme.txt

@@ -3,7 +3,7 @@
 
 Name:           aterm
 Version:        1.0.1
-Release:        29%{?dist}
+Release:        30%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 License:        GPLv2+
@@ -43,9 +43,6 @@ advantage on a machine serving many X sessions.
 %patch10 -p1 -b .sgifixes
 
 %build
-export SHELL=%{_bindir}/sh
-export SHELL_PATH="$SHELL"
-export CONFIG_SHELL="$SHELL"
 
 %configure --enable-fading --enable-background-image \
 --enable-next-scroll --enable-utmp --enable-wtmp \
@@ -70,6 +67,9 @@ make %{?_smp_mflags}
 
 
 %changelog
+* Fri Apr 10 2020 Daniel Hams <[email protected]> - 1.0.1-30
+- Remove hard coded shell paths
+
 * Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 1.0.1-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

packages/aterm/SPECS/aterm.spec

@@ -9,7 +9,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.69
-Release:    31%{?dist}
+Release:    32%{?dist}
 License:    GPLv2+ and GFDL
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
 Source1:    config.site
@@ -78,12 +78,6 @@ their use.
 # Here's a terminator
 
 %prep
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 %autosetup -p1
 
 %build
@@ -92,12 +86,6 @@ export EMACS=%{_bindir}/emacs
 %else
 export EMACS=%{_bindir}/false
 %endif
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 %configure \
     %{?with_autoconf_enables_emacs:--with-lispdir=%{_emacs_sitelispdir}/autoconf}
 make %{?_smp_mflags}
@@ -112,12 +100,6 @@ make check %{?_smp_mflags}
 
 
 %install
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 make install %{?_smp_mflags} DESTDIR=%{buildroot}
 mkdir -p %{buildroot}/share
 install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}
@@ -146,6 +128,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
 
 
 %changelog
+* Fri Apr 10 2020 Daniel Hams <[email protected]> - 2.69-32
+- Remove hard coded shell paths
+
 * Wed Aug 28 2019 Ondrej Dubaj <[email protected]> - 2.69-31
 - Port tests to Bash 5
 

packages/autoconf/SPECS/autoconf.spec

@@ -17,7 +17,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}.1
-Release:    13%{?dist}
+Release:    14%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -101,12 +101,6 @@ Makefiles.
 
 
 %prep
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 %autosetup -p1
 %if %{with check} && %{with automake_enables_optional_test}
 autoreconf -iv
@@ -122,25 +116,13 @@ done
 %build
 # disable replacing config.guess and config.sub from redhat-rpm-config
 %global _configure_gnuconfig_hack 0
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 %configure
 %make_build
 cp m4/acdir/README README.aclocal
 cp contrib/multilib/README README.multilib
 
 
 %install
-export SHELL=%{_bindir}/bash
-export CONFIG_SHELL="$SHELL"
-export SHELL_PATH="$SHELL"
-export PERL_PATH=%{_bindir}/perl
-export PERL=%{_bindir}/perl
-export M4=%{_bindir}/m4
 %make_install
 
 
@@ -166,6 +148,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
 
 
 %changelog
+* Fri Apr 10 2020 Daniel Hams <[email protected]> - 1.16-14
+- Remove hard coded shell paths
+
 * Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 1.16.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild