rename pandoc-static back to pandoc-standalone

1 files changed, 30 insertions, 21 deletions

diff --git a/README.md b/README.md
index 5fdffed..04d1caf 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,25 @@
-# Pandoc static packages
+# Pandoc standalone packages
 
-This builds a statically-linked standalone pandoc and
-pandoc-citeproc binary rpm packages on Enterprise Linux 5
-which should work across current Linux platforms.
+Standalone rpm packages of pandoc and pandoc-citeproc
+built on Enterprise Linux 5
+which also work on Red Hat Enterprise Linux 6
+and older versions of Fedora.
 
-Note that since the binaries are completely statically-linked
-(down to libc) they may need to be rebuilt periodically
-for security updates to the linked libraries.
+To aid portability the executables are statically linked
+against the Haskell dependencies, unlike the packages in
+Fedora and EPEL, and are also built with embedded data files
+and http-conduit support.
 
 ## Download
 
 The binaries can either be:
 
-a) downloaded from <http://petersen.fedorapeople.org/pandoc-static/>
+a) downloaded from <http://petersen.fedorapeople.org/pandoc-standalone/epel-5/>
 
 or
 
 b) if you prefer you can add the yum repo
-<http://petersen.fedorapeople.org/pandoc-static/pandoc-static.repo>
+<http://petersen.fedorapeople.org/pandoc-standalone/pandoc-standalone.repo>
 to /etc/yum.repos.d/ and then installed with:
 
     yum install pandoc pandoc-citeproc
@@ -29,15 +31,14 @@ to /etc/yum.repos.d/ and then installed with:
 - cabal-dev
 - hsb2hs (to embed data files)
 - pcre-devel
-- libffi.a
+- libffi-devel (from EPEL5)
 
 The current packages were built using ghc-7.4.2
 and haskell-platform-2012.4.0.0 with cabal-dev-0.9.1
 packages from the repo
 <http://repos.fedorapeople.org/repos/petersen/ghc-7.4.2/>
-and additionally hsb2hs-0.1 and a rebuilt libffi-3.0.5
-(for libffi.a) from the
-<http://petersen.fedorapeople.org/pandoc-static/> repo.
+and additionally hsb2hs-0.1 from the
+<http://petersen.fedorapeople.org/pandoc-standalone/> repo.
 
 The build from a single spec file needs a network
 connection for cabal to download the Haskell libraries dependencies
@@ -48,26 +49,34 @@ otherwise they need to be downloaded in advance using
 
 Here are the general steps to package the packages on RHEL or Fedora.
 
-### RHEL 5, 6 or older Fedora
+### RHEL 5
 
-    $ pushd /etc/yum.repos.d
     $ su
-    # wget http://repos.fedorapeople.org/repos/petersen/ghc-7.4.2/epel-ghc-7.4.2.repo
-    # wget http://petersen.fedorapeople.org/pandoc-static/pandoc-static.repo
-    # popd
+    # wget http://repos.fedorapeople.org/repos/petersen/ghc-7.4.2/epel-ghc-7.4.2.repo -P /etc/yum.repos.d
+    # wget http://petersen.fedorapeople.org/pandoc-standalone/pandoc-standalone.repo -P /etc/yum.repos.d
     # yum install haskell-platform cabal-dev hsb2hs pcre-devel libffi-devel rpm-build
     # 
     $ cabal update    # skip if run recently
-    $ rpm -iv http://petersen.fedorapeople.org/pandoc-static/SRPMS/pandoc-1.12.3.1-3.src.rpm
+    $ rpm -iv http://petersen.fedorapeople.org/pandoc-standalone/epel-5/SRPMS/pandoc-1.12.3.1-4.src.rpm
+    $ rpmbuild -bb pandoc.spec
+
+### RHEL 6 or older Fedora
+
+    $ sudo wget http://repos.fedorapeople.org/repos/petersen/ghc-7.4.2/epel-ghc-7.4.2.repo -P /etc/yum.repos.d 
+    $ sudo wget http://petersen.fedorapeople.org/pandoc-standalone/pandoc-standalone.repo -P /etc/yum.repos.d 
+    $ sudo yum install yum-utils      # if you don't have yum-builddep
+    $ sudo yum-builddep ~/rpmbuild/SPECS/pandoc.spec
+    $ cabal update    # skip if run recently
+    $ rpm -iv http://petersen.fedorapeople.org/pandoc-standalone/epel-5/SRPMS/pandoc-1.12.3.1-4.src.rpm
     $ rpmbuild -bb ~/rpmbuild/SPECS/pandoc.spec
 
 ### Fedora 19+
 
-    $ rpm -iv http://petersen.fedorapeople.org/pandoc-static/SRPMS/hsb2hs-0.1-1.src.rpm
+    $ rpm -iv http://petersen.fedorapeople.org/pandoc-standalone/epel-5/SRPMS/hsb2hs-0.1-1.src.rpm
     $ cabal update    # skip if run recently
     $ rpmbuild -bb ~/rpmbuild/SPECS/hsb2hs.spec
     $ sudo rpm -ivh ~/rpmbuild/RPMS/$(arch)/hsb2hs-0*
-    $ rpm -iv http://petersen.fedorapeople.org/pandoc-static/SRPMS/pandoc-1.12.3.1-3.src.rpm
+    $ rpm -iv http://petersen.fedorapeople.org/pandoc-standalone/epel-5/SRPMS/pandoc-1.12.3.1-4.src.rpm
     $ sudo yum install yum-utils      # if you don't have yum-builddep
     $ sudo yum-builddep ~/rpmbuild/SPECS/pandoc.spec
     $ rpmbuild -bb ~/rpmbuild/SPECS/pandoc.spec