jjames pushed to coq (f22). "New upstream release. (..more)"

Sun Apr 12 02:18:34 UTC 2015

>From 9a656d1cf1f16eb81c68025bc9cfed38013abbcf Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry at gmail.com>
Date: Sat, 11 Apr 2015 11:47:20 -0600
Subject: New upstream release.

Also:
- Drop upstreamed -fix-ints patch.
- Update appdata URLs.

diff --git a/.gitignore b/.gitignore
index 2ab945e..bfcedbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/coq-8.4pl5.tar.gz
+/coq-8.4pl6.tar.gz
diff --git a/coq-8.4pl4-fix-ints.patch b/coq-8.4pl4-fix-ints.patch
deleted file mode 100644
index bb89bbb..0000000
--- a/coq-8.4pl4-fix-ints.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- coq-8.4pl4.old/kernel//byterun/coq_interp.c	2014-04-24 16:13:03.000000000 +0100
-+++ coq-8.4pl4/kernel//byterun/coq_interp.c	2014-08-30 21:26:04.912672254 +0100
-@@ -29,6 +29,11 @@
- #include "int64_emul.h"
- #endif
- 
-+#define int64 int64_t
-+#define uint64 uint64_t
-+#define int32 int32_t
-+#define uint32 uint32_t
-+
- /* spiwack: I append here a few macros for value/number manipulation */
- #define uint32_of_value(val) (((uint32)val >> 1))
- #define value_of_uint32(i)   ((value)(((uint32)(i) << 1) | 1))
---- coq-8.4pl4.old/kernel//byterun/coq_fix_code.c	2014-04-24 16:13:03.000000000 +0100
-+++ coq-8.4pl4/kernel//byterun/coq_fix_code.c	2014-08-30 21:28:58.174844206 +0100
-@@ -21,6 +21,11 @@
- #include "coq_instruct.h"
- #include "coq_fix_code.h"
- 
-+#define int64 int64_t
-+#define uint64 uint64_t
-+#define int32 int32_t
-+#define uint32 uint32_t
-+
- #ifdef THREADED_CODE
- char ** coq_instr_table;
- char * coq_instr_base;
diff --git a/coq.spec b/coq.spec
index 113fcb7..47eb05a 100644
--- a/coq.spec
+++ b/coq.spec
@@ -17,8 +17,8 @@
 # however, this name is proper as per the Coq documentation
 
 Name:           coq
-Version:        8.4pl5
-Release:        4%{?dist}
+Version:        8.4pl6
+Release:        1%{?dist}
 Summary:        Proof management system
 
 License:        LGPLv2
@@ -29,9 +29,6 @@ Source2:        README.coq-emacs
 Source4:        coq.xml
 Source5:        coqide.appdata.xml
 
-# Fix for OCaml > 4.02.0 and Fedora.
-Patch0:         coq-8.4pl4-fix-ints.patch
-
 BuildRequires:  ocaml
 BuildRequires:  ocaml-camlp5-devel
 BuildRequires:  ocaml-lablgtk-devel
@@ -133,8 +130,6 @@ This package is not needed to use the Emacs interface.
 %prep
 %setup -q
 
-%patch0 -p1
-
 # Fix some files that are not in UTF-8 encoding
 
 for f in CREDITS doc/LICENSE; do
@@ -148,8 +143,8 @@ cp -p %SOURCE1 %SOURCE2 .
 # Fix a Makefile rule that causes installation to fail
 sed -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.build
 
-# Use full relro due to network use.  Also fix broken CAML_LD_LIBRARY_PATH.
-sed -e 's/-lunix/& -ccopt -Wl,-z,relro,-z,now/' \
+# Use relro due to network use.  Also fix broken CAML_LD_LIBRARY_PATH.
+sed -e 's/-lunix/& -ccopt -Wl,-z,relro/' \
     -e "s,'\$COQTOP'/kernel,\$COQTOP/kernel," \
     -i configure
 
@@ -309,6 +304,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_emacs_sitelispdir}/coq/*.el
 
 %changelog
+* Sat Apr 11 2015 Jerry James <loganjerry at gmail.com> - 8.4pl6-1
+- New upstream release
+- Drop upstreamed -fix-ints patch
+- Update appdata URLs
+
 * Mon Feb 16 2015 Richard W.M. Jones <rjones at redhat.com> - 8.4pl5-4
 - Bump release and rebuild.
 
diff --git a/coqide.appdata.xml b/coqide.appdata.xml
index 759e994..4335bd1 100644
--- a/coqide.appdata.xml
+++ b/coqide.appdata.xml
@@ -2,7 +2,7 @@
 <application>
  <id type="desktop">coqide.desktop</id>
  <licence>CC0</licence>
- <summary>Coq IDE</summary>
+ <summary>Coq graphical interface</summary>
  <description>
   <p>
    Coq is a formal proof management system. It allows for the development of
@@ -15,14 +15,12 @@
   </p>
  </description>
  <screenshots>
-  <screenshot type="default">http://coq.inria.fr/coq/files/coqide/images/capture1.jpg</screenshot>
-  <screenshot>http://coq.inria.fr/coq/files/coqide/images/capture2.jpg</screenshot>
-  <screenshot>http://coq.inria.fr/coq/files/coqide/images/capture3.jpg</screenshot>
-  <screenshot>http://coq.inria.fr/coq/files/coqide/images/capture4.jpg</screenshot>
-  <screenshot>http://coq.inria.fr/coq/files/coqide/images/capture5.jpg</screenshot>
+  <screenshot type="default">https://coq.inria.fr/files/coqide/images/capture1.jpg</screenshot>
+  <screenshot>https://coq.inria.fr/files/coqide/images/capture2.jpg</screenshot>
+  <screenshot>https://coq.inria.fr/files/coqide/images/capture3.jpg</screenshot>
+  <screenshot>https://coq.inria.fr/files/coqide/images/capture4.jpg</screenshot>
+  <screenshot>https://coq.inria.fr/files/coqide/images/capture5.jpg</screenshot>
  </screenshots>
- <url type="homepage">http://coq.inria.fr/</url>
- <!-- FIXME: change this to an upstream email address for spec updates
-   <updatecontact>someone_who_cares at upstream_project.org</updatecontact>
-  -->
+ <url type="homepage">https://coq.inria.fr/</url>
+ <updatecontact>loganjerry at gmail.com</updatecontact>
 </application>
diff --git a/sources b/sources
index 2a85363..8bed185 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7839005b48527a85149da950bd2ac006  coq-8.4pl5.tar.gz
+2334a98b64578cb81d2b4127e327b368  coq-8.4pl6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/coq.git/commit/?h=f22&id=9a656d1cf1f16eb81c68025bc9cfed38013abbcf
