Browse Source

upgrade to 4.4.2; move up the HTML code because it has to stay side-by-side with the CSS file anyway; get rid of the UN*X workaround now that the files are named Unix

Ralf S. Engelschall 23 years ago
parent
commit
d02bf10f81
2 changed files with 6 additions and 12 deletions
  1. 1 1
      jargon/jargon.sh
  2. 5 11
      jargon/jargon.spec

+ 1 - 1
jargon/jargon.sh

@@ -6,7 +6,7 @@
 
 
 w3m="@l_prefix@/bin/w3m"
 w3m="@l_prefix@/bin/w3m"
 awk="@l_prefix@/bin/gawk"
 awk="@l_prefix@/bin/gawk"
-html="@l_prefix@/share/jargon/html"
+html="@l_prefix@/share/jargon"
 
 
 IDX='
 IDX='
     BEGIN {
     BEGIN {

+ 5 - 11
jargon/jargon.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Distribution: OpenPKG [PLUS]
 Group:        Misc
 Group:        Misc
 License:      PD
 License:      PD
-Version:      4.4.1
-Release:      20030513
+Version:      4.4.2
+Release:      20030522
 
 
 #   list of sources
 #   list of sources
 Source0:      http://www.catb.org/~esr/jargon/jargon-%{version}.tar.gz
 Source0:      http://www.catb.org/~esr/jargon/jargon-%{version}.tar.gz
@@ -62,17 +62,11 @@ AutoReqProv:  no
 
 
     %{l_shtool} mkdir -f -p -m 755 \
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/jargon \
         $RPM_BUILD_ROOT%{l_prefix}/share/jargon
         $RPM_BUILD_ROOT%{l_prefix}/share/jargon
 
 
-    cp -r * $RPM_BUILD_ROOT%{l_prefix}/share/jargon
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/jargon/html/*-frame.html
-    mv $RPM_BUILD_ROOT%{l_prefix}/share/jargon/html/U/UN\*X.html \
-       $RPM_BUILD_ROOT%{l_prefix}/share/jargon/html/U/UN_X.html
-
-    %{l_shtool} subst \
-        -e 's/UN\*X\.html/UN_X.html/g;' \
-        $RPM_BUILD_ROOT%{l_prefix}/share/jargon/html/U.html
+    cp *.css     $RPM_BUILD_ROOT%{l_prefix}/share/jargon/
+    cp -r html/* $RPM_BUILD_ROOT%{l_prefix}/share/jargon/
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/jargon/*-frame.html
 
 
     %{l_shtool} install -c -m 755 \
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_prefix@;%{l_prefix};g' \