diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-04 06:25:53 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-10-04 06:28:26 +0200 |
| commit | 91a3c8005d5d28afa7821db2f942fede9b9cf99e (patch) | |
| tree | f34a08d7869415a2f37baba75b344f49b1ea776a | |
| parent | 88abd73eeb81a6b77069345252a7138583a1fda4 (diff) | |
gnu: rpm: Update to 4.14.2.
* gnu/packages/package-management.scm (rpm): Update to 4.14.2.
[arguments]: Rename 'set-nspr-search-path' phase to
'set-nss-library-path' and remove CPATH work-around.
Remove obsolete 'fix-rpm-symlinks' phase.
[home-page]: Drop www.
| -rw-r--r-- | gnu/packages/package-management.scm | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 69788c9463..42172d8242 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -495,7 +495,7 @@ symlinks to the files in a common directory such as /usr/local.") (define-public rpm (package (name "rpm") - (version "4.13.0.2") + (version "4.14.2") (source (origin (method url-fetch) (uri (string-append "http://ftp.rpm.org/releases/rpm-" @@ -503,40 +503,20 @@ symlinks to the files in a common directory such as /usr/local.") version ".tar.bz2")) (sha256 (base32 - "1521y4ghjns449kzpwkjn9cksh686383xnfx0linzlalqc3jqgig")))) + "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-db" ;use the system's bdb "--enable-python" "--without-lua") #:phases (modify-phases %standard-phases - (add-before 'configure 'set-nspr-search-path + (add-before 'configure 'set-nss-library-path (lambda* (#:key inputs #:allow-other-keys) - ;; nspr.pc contains the right -I flag pointing to - ;; 'include/nspr', but unfortunately 'configure' doesn't - ;; use 'pkg-config'. Thus, augment CPATH. - ;; Likewise for NSS. - (let ((nspr (assoc-ref inputs "nspr")) - (nss (assoc-ref inputs "nss"))) - (setenv "CPATH" - (string-append (getenv "C_INCLUDE_PATH") ":" - nspr "/include/nspr:" - nss "/include/nss")) + (let ((nss (assoc-ref inputs "nss"))) (setenv "LIBRARY_PATH" (string-append (getenv "LIBRARY_PATH") ":" nss "/lib/nss")) - #t))) - (add-after 'install 'fix-rpm-symlinks - (lambda* (#:key outputs #:allow-other-keys) - ;; 'make install' gets these symlinks wrong. Fix them. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (with-directory-excursion bin - (for-each (lambda (file) - (delete-file file) - (symlink "rpm" file)) - '("rpmquery" "rpmverify")) - #t))))))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -552,7 +532,7 @@ symlinks to the files in a common directory such as /usr/local.") ("bzip2" ,bzip2) ("zlib" ,zlib) ("cpio" ,cpio))) - (home-page "http://www.rpm.org/") + (home-page "http://rpm.org/") (synopsis "The RPM Package Manager") (description "The RPM Package Manager (RPM) is a command-line driven package |