commit d4aacc8e65498312e1ce54787a73c5fa4848d1e3
Author: Jakub Bogusz <[email protected]>
Date: Fri Sep 10 22:58:56 2021 +0200
- updated to 8.00.02
- removed obsolete DESTDIR patch
DESTDIR.patch | 36 ------------------------------------
camlp5.spec | 7 +++----
2 files changed, 3 insertions(+), 40 deletions(-)
---
diff --git a/camlp5.spec b/camlp5.spec
index e137054..13f4000 100644
--- a/camlp5.spec
+++ b/camlp5.spec
@@ -14,14 +14,14 @@
Summary: Objective Caml Preprocessor
Summary(pl.UTF-8): Preprocesor OCamla
Name: camlp5
-Version: 8.00
+Version: 8.00.02
Release: 1
License: distributable
Group: Development/Languages
+#Source0Download: https://github.com/camlp5/camlp5/releases
Source0:
https://github.com/camlp5/camlp5/archive/rel%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 477cdfa2be786ebc37c75e280d3ee504
+# Source0-md5: 096076be4b26034643508511e834ccc2
Patch0: no-warn-error.patch
-Patch1: DESTDIR.patch
URL: https://camlp5.github.io/
BuildRequires: db-devel >= 4.1
BuildRequires: ocaml
@@ -84,7 +84,6 @@ Preprocesor OCamla - dokumentacja w formacie PDF.
%prep
%setup -q -n %{name}-rel%{version}
%patch0 -p1
-%patch1 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
etc/mkcamlp5.pl
diff --git a/DESTDIR.patch b/DESTDIR.patch
deleted file mode 100644
index 57b44ba..0000000
--- a/DESTDIR.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2865ecfe5e02f8895c555396993b49b3b08a3550 Mon Sep 17 00:00:00 2001
-From: Chet Murthy <[email protected]>
-Date: Fri, 15 Jan 2021 12:35:50 -0800
-Subject: [PATCH] fix META file generation (DESTDIR) issue; Fix #75
-
----
- Makefile | 2 +-
- etc/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c9adcc46..7748ddd6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,7 +51,7 @@ depend:
-
- local-install::
- $(RM) -rf local-install && mkdir -p local-install/lib/ocaml
-- $(MAKE) DESTDIR=`pwd`/local-install/ LIBDIR=lib BINDIR=bin MANDIR=man
install
-+ $(MAKE) DESTDIR= LIBDIR=`pwd`/local-install/lib
BINDIR=`pwd`/local-install/bin MANDIR=man install
-
- install:
- $(NOVERBOSE) if test -z "$(LIBDIR)"; then \
-diff --git a/etc/Makefile b/etc/Makefile
-index ef4593cc..f8913866 100644
---- a/etc/Makefile
-+++ b/etc/Makefile
-@@ -106,7 +106,7 @@ install:
- -$(MKDIR) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)" "$(DESTDIR)$(BINDIR)"
- $(RM) -f "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/pa_lex.cmo"
- cp $(OBJS) $(INSTALL_CMI) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
-- sed -e "s|@VERSION@|$(VERSION)|" -e
"s|@CAMLP5DIR@|$(DESTDIR)$(LIBDIR)/$(CAMLP5N)|" META.tpl > META
-+ sed -e "s|@VERSION@|$(VERSION)|" -e
"s|@CAMLP5DIR@|$(LIBDIR)/$(CAMLP5N)|" META.tpl > META
- cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
- cp lib.sml "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
- cp $(CAMLP5N)o$(EXE) $(CAMLP5N)sch$(EXE) "$(DESTDIR)$(BINDIR)/."
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/camlp5.git/commitdiff/d4aacc8e65498312e1ce54787a73c5fa4848d1e3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
