From 8b20d2feb0d39613962ff3fd11beb9a83ab1473b Mon Sep 17 00:00:00 2001
From: Holden Rohrer
Date: Wed, 29 Jul 2020 22:12:37 -0400
Subject: centralized version stuff into the makefile and js->css
---
.gitignore | 3 +++
Makefile | 17 ++++++++++++-----
minimun.spec | 51 ---------------------------------------------------
orig/minimun.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
www/index.html | 42 +++++++++++++++++++++---------------------
5 files changed, 87 insertions(+), 77 deletions(-)
delete mode 100644 minimun.spec
create mode 100644 orig/minimun.spec
diff --git a/.gitignore b/.gitignore
index 2adc16f..1e6ca96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ minimun
format.tex
!orig/*
minimun.tar.gz
+dist
+minimun.spec
+minimun-*.rpm
diff --git a/Makefile b/Makefile
index 73cf841..9db040e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
.POSIX:
DESTDIR=/home/minimun/minimun
-VER=1.1
WEBLOC=/minimun
SYSWEBROOT=/var/www/html
WEBROOT=$(SYSWEBROOT)$(WEBLOC)
DIRS=$(DESTDIR) $(WEBROOT)
+VER=1.2
+REL=1
all: format.tex minimun
@@ -17,27 +18,33 @@ format.tex: orig/format.tex
sed 's:%%DEST%%:$(DESTDIR):' orig/format.tex > format.tex
clean:
- rm minimun
+ rm -f minimun format.tex minimun.spec minimun.tar.gz \
+ minimun-$(VER)-$(REL).noarch.rpm
install: $(DIRS) all
cp -t $(DESTDIR) minimun format.tex logo.png
cp -RT www $(WEBROOT)
uninstall:
- rm $(DESTDIR)/{minimun,format.tex,logo.png}
- rmdir -p $(DESTDIR)
+ rm -f $(DESTDIR)/{minimun,format.tex,logo.png} $(WEBROOT)/*
+ rmdir -p $(DIRS)
SRC = LICENCE logo.png Makefile minimun.ini orig\
nginx.example.conf README www minimun.spec
-dist: minimun.tar.gz
+dist: minimun.tar.gz minimun.spec
mkdir -pv ~/rpmbuild/SOURCES
cp minimun.tar.gz ~/rpmbuild/SOURCES
rpmbuild minimun.spec -ba
+ cp ~/rpmbuild/RPMS/noarch/minimun-$(VER)-$(REL).noarch.rpm .
+ touch dist
minimun.tar.gz: $(SRC)
mkdir minimun-$(VER)
cp -r -t minimun-$(VER) $(SRC)
tar -czf minimun.tar.gz minimun-$(VER)
rm -rf minimun-$(VER)
+minimun.spec: orig/minimun.spec
+ sed -e 's/VERSION/$(VER)/' -e 's/RELEASE/$(REL)/' orig/minimun.spec\
+ > $@
$(DIRS):
mkdir -p $@
diff --git a/minimun.spec b/minimun.spec
deleted file mode 100644
index 911188c..0000000
--- a/minimun.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-Summary: A perl cgi/pdfTeX script for doc generation
-Name: minimun
-Version: 1.1
-Release: 2
-License: GPL, Unknown
-Source: https://hrhr.dev/src/minimun.tar.gz
-URL: https://git.hrhr.dev/minimun/about
-Distribution: Fedora 32
-Vendor: Holden Rohrer
-Packager: Holden Rohrer
-BuildArch: noarch
-Requires: perl
-Requires: texlive-pdftex
-Requires: texlive-amsfonts
-Requires: texlive-metafont
-Requires: texlive-mfware
-Requires: texlive-updmap-map
-Requires(pre): shadow-utils
-BuildRequires: make
-
-%description
-This script builds award documents and room name sheets, for letter-size
-paper. The code is under GPLv3, but the logo's license is unknown.
-
-%global debug_package %{nil}
-
-%pre
-getent group minimun >/dev/null || groupadd -r minimun
-getent passwd minimun >/dev/null || useradd -r -s /sbin/nologin\
- -g minimun -c "miniMUN cgi account" -d /usr/lib/minimun -M minimun
-
-%prep
-%setup
-
-%build
-make DESTDIR=/usr/lib/minimun SYSWEBROOT=/var/www/html
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT/usr/lib/minimun \
-SYSWEBROOT=$RPM_BUILD_ROOT/var/www/html
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%doc README
-%defattr(644, minimun, minimun, 755)
-/usr/lib/minimun
-%attr(755, minimun, minimun) /usr/lib/minimun/minimun
-/var/www/html/minimun/index.html
diff --git a/orig/minimun.spec b/orig/minimun.spec
new file mode 100644
index 0000000..c76dc31
--- /dev/null
+++ b/orig/minimun.spec
@@ -0,0 +1,51 @@
+Summary: A perl cgi/pdfTeX script for doc generation
+Name: minimun
+Version: VERSION
+Release: RELEASE
+License: GPL, Unknown
+Source: https://hrhr.dev/src/minimun.tar.gz
+URL: https://git.hrhr.dev/minimun/about
+Distribution: Fedora 32
+Vendor: Holden Rohrer
+Packager: Holden Rohrer
+BuildArch: noarch
+Requires: perl
+Requires: texlive-pdftex
+Requires: texlive-amsfonts
+Requires: texlive-metafont
+Requires: texlive-mfware
+Requires: texlive-updmap-map
+Requires(pre): shadow-utils
+BuildRequires: make
+
+%description
+This script builds award documents and room name sheets, for letter-size
+paper. The code is under GPLv3, but the logo's license is unknown.
+
+%global debug_package %{nil}
+
+%pre
+getent group minimun >/dev/null || groupadd -r minimun
+getent passwd minimun >/dev/null || useradd -r -s /sbin/nologin\
+ -g minimun -c "miniMUN cgi account" -d /usr/lib/minimun -M minimun
+
+%prep
+%setup
+
+%build
+make DESTDIR=/usr/lib/minimun SYSWEBROOT=/var/www/html
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT/usr/lib/minimun \
+SYSWEBROOT=$RPM_BUILD_ROOT/var/www/html
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%doc README
+%defattr(644, minimun, minimun, 755)
+/usr/lib/minimun
+%attr(755, minimun, minimun) /usr/lib/minimun/minimun
+/var/www/html/minimun/index.html
diff --git a/www/index.html b/www/index.html
index 32634d4..d542208 100644
--- a/www/index.html
+++ b/www/index.html
@@ -2,33 +2,33 @@
MiniMUN PDF Generator
-
+ input#awardbutton:checked ~ form#room {
+ display: none;
+ }
+ input#roombutton:checked ~ form#award {
+ display: none;
+ }
+
- Form Type:
- Award
- Room
+ Award
+ Room
-
--
cgit