diff options
| author | Jens Petersen <petersen@redhat.com> | 2014-02-03 00:50:05 +0900 |
|---|---|---|
| committer | Jens Petersen <petersen@redhat.com> | 2014-02-03 00:50:05 +0900 |
| commit | 903007851bc8778a7a88df8726e7a7364a460101 (patch) | |
| tree | 0dbba09fc554084e4b7603bc440b49f10cef6d84 | |
| parent | 6858ddb28fe5e596036f275637bd1fe6236484a5 (diff) | |
| download | pandoc-standalone-903007851bc8778a7a88df8726e7a7364a460101.tar.gz pandoc-standalone-903007851bc8778a7a88df8726e7a7364a460101.tar.xz pandoc-standalone-903007851bc8778a7a88df8726e7a7364a460101.zip | |
README improvements
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | README.md | 57 |
2 files changed, 37 insertions, 21 deletions
@@ -1 +1,2 @@ /pandoc-1.12.3.1 +/README.html @@ -10,11 +10,17 @@ for security updates to the linked libraries. ## Download -The binaries can be downloaded from: -http://petersen.fedorapeople.org/pandoc-static/epel-5/ -or if you prefer you can add the yum repo -http://petersen.fedorapeople.org/pandoc-static/pandoc-static.repo -to /etc/yum.repos.d/. +The binaries can either be: + +a) downloaded from <http://petersen.fedorapeople.org/pandoc-static/> + +or + +b) if you prefer you can add the yum repo +<http://petersen.fedorapeople.org/pandoc-static/pandoc-static.repo> +to /etc/yum.repos.d/ and then installed with: + + yum install pandoc pandoc-citeproc ## Build requirements @@ -27,21 +33,22 @@ to /etc/yum.repos.d/. The current packages were built using ghc-7.4.2 and haskell-platform-2012.4.0.0 with cabal-dev-0.9.1 -packages in 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) are in the -http://petersen.fedorapeople.org/pandoc-static/epel-5/ repo. +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. The build from a single spec file needs a network -connection to download the Haskell libraries dependencies -otherwise they need to be downloaded in advance using cabal. +connection for cabal to download the Haskell libraries dependencies +otherwise they need to be downloaded in advance using +{cabal fetch pandoc-citeproc}. ## Build steps Here are the general steps to package the packages on RHEL or Fedora. -### RHEL 5 +### RHEL 5, 6 or older Fedora $ pushd /etc/yum.repos.d $ su @@ -50,18 +57,26 @@ Here are the general steps to package the packages on RHEL or Fedora. # popd # yum install haskell-platform cabal-dev hsb2hs pcre-devel libffi-devel rpm-build # - $ cabal update # skip if you have run recently - $ rpm -iv pandoc-1.12.3.1-3.src.rpm + $ cabal update # skip if run recently + $ rpm -iv http://petersen.fedorapeople.org/pandoc-static/SRPMS/pandoc-1.12.3.1-3.src.rpm $ rpmbuild -bb ~/rpmbuild/SPECS/pandoc.spec -### Fedora or RHEL >= 6 +### Fedora 19+ - $ sudo yum-builddep pandoc.spec - $ cabal update # skip if you have run recently - $ cabal install hsb2hs - $ rpmbuild -bb pandoc.spec + $ rpm -iv http://petersen.fedorapeople.org/pandoc-static/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 + $ 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 + $ sudo rpm -Uvh ~/rpmbuild/RPMS/$(arch)/pandoc-* -or in dir with pandoc.spec run +or in the dir with pandoc.spec just run: + $ cabal install hsb2hs + $ # comment out "Requires: hsb2hs" in pandoc.spec $ sudo yum install cabal-rpm $ cblrpm rpm pandoc + $ sudo rpm -Uvh ~/rpmbuild/RPMS/$(arch)/pandoc-* |